Melanie 35c3124c3b Merge branch 'master' into careminster ...

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

2012-03-20 23:39:02 +00:00

..

Clients

Added missing "Old Guids=true" to ConnectionString

2011-06-10 21:10:37 +01:00

Common

Merge branch 'master' into careminster

2012-03-20 23:39:02 +00: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