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

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

2012-03-07 00:51:59 +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-07 00:51:59 +00:00

Torture

Stop individually deleting objects at the end of each ObjectTortureTest.

2012-03-07 00:31:18 +00:00

ConfigurationLoaderTest.cs

Shell Environment Variables in config

2011-11-23 10:11:47 -05:00