Melanie f3132c45d9 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Tests/Common/Mock/TestClient.cs		2012-03-31 02:18:02 +01:00
..
Clients	Updated the UserAccountsClient a little bit, plus some more sanity checks on the service connector.	2012-03-21 11:22:39 -07:00
Common	Merge branch 'master' into careminster	2012-03-31 02:18:02 +01:00
Torture	Move frame loop entirely within Scene.Update() for better future performance analysis and stat accuracy.	2012-03-20 23:12:21 +00:00
ConfigurationLoaderTest.cs	Shell Environment Variables in config	2011-11-23 10:11:47 -05:00