Melanie a9dad99432 Merge branch 'master' into careminster-presence-refactor ...

Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

2010-05-23 06:09:54 +01:00

..

Server

Merge branch 'master' into careminster-presence-refactor

2010-05-23 06:09:54 +01:00

IRCStackModule.cs

Revert "Updates all IRegionModules to the new style region modules."

2010-01-29 07:21:06 +00:00