Melanie c6e9db5866 Merge branch 'master' into careminster ... Conflicts: OpenSim/Framework/RegionSettings.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Interfaces/IInterregionComms.cs OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs		2014-01-28 21:02:20 +00:00
..
Clients	Make test AssetsClient print out more information about any failure to set thread numbers and immediate post config thread numbers	2013-08-05 20:36:46 +01:00
Common	Merge branch 'master' into careminster	2014-01-28 21:02:20 +00:00
Performance	Committing the Avination Scene Presence and related texture code	2013-12-11 01:39:56 +00:00
Stress	Revert "Merge master into teravuswork", it should have been avination, not master.	2012-11-15 10:05:16 -05:00
ConfigurationLoaderTest.cs	Add regression tests for llGetNotecardLine()	2013-02-28 20:57:03 +00:00