Melanie 1f32730798 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

2012-03-03 09:58:57 +00:00

..

Interfaces

Register the UrlModule for script engine events OnScriptRemoved and OnObjectRemoved just once in the UrlModule itself, rather than repeatedly for every script.

2012-01-14 00:23:11 +00:00

Shared

Merge branch 'master' into careminster

2012-03-03 09:58:57 +00:00

XEngine

Merge branch 'master' into careminster

2012-02-07 21:09:04 +00:00