Melanie 50321fb7bf Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs

2012-05-09 00:43:33 +01:00

..

Interfaces

refactor: Eliminate local id parameter from api initialize.

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

Shared

Merge branch 'master' into careminster

2012-05-09 00:43:33 +01:00

XEngine

Merge branch 'master' into careminster

2012-04-27 17:09:49 +01:00