Melanie dc5f831ca8 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2012-03-09 02:39:14 +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-09 02:39:14 +00:00

XEngine

Merge branch 'master' into careminster

2012-03-08 19:10:22 +00:00