RIP OpenSimRoot. (removed)

Merged most of the bug fixes etc in from LLdemo branch.
Added the textures from that branch.

1 files changed, 2 insertions, 2 deletions

diff --git a/OpenSim/RegionServer.cs b/OpenSim/RegionServer.cs
index 30eec3b..0244116 100644
--- a/OpenSim/RegionServer.cs
+++ b/OpenSim/RegionServer.cs
@@ -42,8 +42,8 @@ namespace OpenSim
             }

 

             OpenSimMain sim = new OpenSimMain( sandBoxMode, startLoginServer, physicsEngine );

-            OpenSimRoot.Instance.Application = sim;

-            OpenSimRoot.Instance.Sandbox = sandBoxMode;

+           // OpenSimRoot.Instance.Application = sim;

+            sim.m_sandbox = sandBoxMode;

             OpenSim.world.Avatar.PhysicsEngineFlying = allowFlying;

 

             sim.StartUp();