aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Examples/SimpleApp/Program.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Examples/SimpleApp/Program.cs')
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Program.cs9
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index 0c688ba..3e4bfee 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -47,6 +47,9 @@ namespace SimpleApp
47 47
48 AssetCache assetCache = new AssetCache(assetServer); 48 AssetCache assetCache = new AssetCache(assetServer);
49 49
50 ScenePresence.LoadTextureFile("avatar-texture.dat");
51 ScenePresence.PhysicsEngineFlying = true;
52
50 PhysicsManager physManager = new PhysicsManager(); 53 PhysicsManager physManager = new PhysicsManager();
51 physManager.LoadPlugins(); 54 physManager.LoadPlugins();
52 55
@@ -65,7 +68,7 @@ namespace SimpleApp
65 68
66 world = new MyWorld( regionInfo, m_circuitManager, communicationsManager, assetCache, storeMan, httpServer); 69 world = new MyWorld( regionInfo, m_circuitManager, communicationsManager, assetCache, storeMan, httpServer);
67 world.PhysScene = physManager.GetPhysicsScene("basicphysics"); //PhysicsScene.Null; 70 world.PhysScene = physManager.GetPhysicsScene("basicphysics"); //PhysicsScene.Null;
68 71
69 world.LoadWorldMap(); 72 world.LoadWorldMap();
70 world.PhysScene.SetTerrain(world.Terrain.getHeights1D()); 73 world.PhysScene.SetTerrain(world.Terrain.getHeights1D());
71 74
@@ -81,6 +84,8 @@ namespace SimpleApp
81 world.ParcelManager.NoParcelDataFromStorage(); 84 world.ParcelManager.NoParcelDataFromStorage();
82 } 85 }
83 86
87 world.StartTimer();
88
84 PrimitiveBaseShape shape = PrimitiveBaseShape.DefaultBox(); 89 PrimitiveBaseShape shape = PrimitiveBaseShape.DefaultBox();
85 shape.Scale = new LLVector3(0.5f, 0.5f, 0.5f); 90 shape.Scale = new LLVector3(0.5f, 0.5f, 0.5f);
86 LLVector3 pos = new LLVector3(138, 129, 27); 91 LLVector3 pos = new LLVector3(138, 129, 27);
@@ -91,8 +96,6 @@ namespace SimpleApp
91 m_character = new MyNpcCharacter(); 96 m_character = new MyNpcCharacter();
92 world.AddNewClient(m_character, false); 97 world.AddNewClient(m_character, false);
93 98
94 world.StartTimer();
95
96 m_log.WriteLine(LogPriority.NORMAL, "Press enter to quit."); 99 m_log.WriteLine(LogPriority.NORMAL, "Press enter to quit.");
97 m_log.ReadLine(); 100 m_log.ReadLine();
98 101