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

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

2012-03-07 00:51:59 +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-07 00:51:59 +00:00

XEngine

Merge branch 'master' into careminster

2012-03-07 00:51:59 +00:00