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

Conflicts:
	OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SimStatsReporter.cs

2012-06-06 13:07:05 +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-06-06 13:07:05 +01:00

XEngine

Merge branch 'master' into careminster

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