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

Conflicts:
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs

2012-06-21 01:10:13 +01:00

..

Interfaces

refactor: Eliminate local id parameter from api initialize.

2012-05-08 23:20:27 +01:00

Shared

Merge branch 'avination' into careminster

2012-06-15 15:48:34 +01:00

XEngine

Merge branch 'master' into careminster

2012-06-21 01:10:13 +01:00