Melanie 2e0ce70e63 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/ModuleLoader.cs OpenSim/Region/Framework/Scenes/SceneManager.cs		2012-11-12 23:27:47 +00:00
..
Linden	Merge branch 'master' into careminster	2012-11-12 23:27:47 +00:00
ClientStackManager.cs	Formatting cleanup.	2009-10-01 01:17:47 +09:00
IClientNetworkServer.cs	Beginning work on the new LLUDP implementation	2009-10-05 17:38:14 -07:00
RegionApplicationBase.cs	Added unit tests for multi-region OARs	2012-09-14 20:32:25 +01:00