aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMW2007-03-28 13:08:27 +0000
committerMW2007-03-28 13:08:27 +0000
commit98d81485e724b26d9ad35b9b7cd24c98808b9a81 (patch)
treee806f29235952264161fd33aab652937e84b1870 /OpenSim
parent* And lo, the OpenSim (which is actually the RegionServer) is decoupled from ... (diff)
downloadopensim-SC-98d81485e724b26d9ad35b9b7cd24c98808b9a81.zip
opensim-SC-98d81485e724b26d9ad35b9b7cd24c98808b9a81.tar.gz
opensim-SC-98d81485e724b26d9ad35b9b7cd24c98808b9a81.tar.bz2
opensim-SC-98d81485e724b26d9ad35b9b7cd24c98808b9a81.tar.xz
RIP OpenSimRoot. (removed)
Merged most of the bug fixes etc in from LLdemo branch. Added the textures from that branch.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/RegionServer.cs4
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
42 } 42 }
43 43
44 OpenSimMain sim = new OpenSimMain( sandBoxMode, startLoginServer, physicsEngine ); 44 OpenSimMain sim = new OpenSimMain( sandBoxMode, startLoginServer, physicsEngine );
45 OpenSimRoot.Instance.Application = sim; 45 // OpenSimRoot.Instance.Application = sim;
46 OpenSimRoot.Instance.Sandbox = sandBoxMode; 46 sim.m_sandbox = sandBoxMode;
47 OpenSim.world.Avatar.PhysicsEngineFlying = allowFlying; 47 OpenSim.world.Avatar.PhysicsEngineFlying = allowFlying;
48 48
49 sim.StartUp(); 49 sim.StartUp();