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.cs14
1 files changed, 10 insertions, 4 deletions
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index e5e2234..3723c3d 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -21,6 +21,7 @@ namespace SimpleApp
21 private LogBase m_log; 21 private LogBase m_log;
22 AuthenticateSessionsBase m_circuitManager; 22 AuthenticateSessionsBase m_circuitManager;
23 uint m_localId; 23 uint m_localId;
24 public MyWorld world;
24 25
25 private void Run() 26 private void Run()
26 { 27 {
@@ -57,8 +58,9 @@ namespace SimpleApp
57 58
58 RegionInfo regionInfo = new RegionInfo( 1000, 1000, internalEndPoint, "127.0.0.1" ); 59 RegionInfo regionInfo = new RegionInfo( 1000, 1000, internalEndPoint, "127.0.0.1" );
59 60
60 MyWorld world = new MyWorld(packetServer.ClientManager, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer); 61 world = new MyWorld(packetServer.ClientManager, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer);
61 world.PhysScene = physManager.GetPhysicsScene("basicphysics"); //PhysicsScene.Null; 62 world.PhysScene = physManager.GetPhysicsScene("basicphysics"); //PhysicsScene.Null;
63 world.LoadWorldMap();
62 udpServer.LocalWorld = world; 64 udpServer.LocalWorld = world;
63 65
64 httpServer.Start(); 66 httpServer.Start();
@@ -66,13 +68,16 @@ namespace SimpleApp
66 m_log.WriteLine( LogPriority.NORMAL, "Press enter to quit."); 68 m_log.WriteLine( LogPriority.NORMAL, "Press enter to quit.");
67 m_log.ReadLine(); 69 m_log.ReadLine();
68 70
71
72 /*
69 PrimitiveBaseShape shape = PrimitiveBaseShape.DefaultBox(); 73 PrimitiveBaseShape shape = PrimitiveBaseShape.DefaultBox();
70 74
71 shape.Scale = new LLVector3(10, 10, 10); 75 shape.Scale = new LLVector3(0.5f, 0.5f, 0.5f);
72 76
73 LLVector3 pos = new LLVector3(128,128,72); 77 LLVector3 pos = new LLVector3(129,130,25);
74 78
75 world.AddNewPrim( LLUUID.Zero, pos, shape ); 79 world.AddNewPrim( LLUUID.Random(), pos, shape );
80 */
76 81
77 } 82 }
78 83
@@ -129,6 +134,7 @@ namespace SimpleApp
129 Program app = new Program(); 134 Program app = new Program();
130 135
131 app.Run(); 136 app.Run();
137
132 } 138 }
133 } 139 }
134} 140}