From a04602d9c136b882a6c72d4c3c09c3ca0d526c37 Mon Sep 17 00:00:00 2001
From: MW
Date: Sat, 14 Jul 2007 13:18:02 +0000
Subject: Added AddPreCompiledScript method to ScriptManager. Done some work on
 lbsa71's simpleApp(hope he doesn't mind): now have the avatar showing up and
 the terrain and his pulsating box (well except its not a box, as there seems
 to be something wrong with our PrimitiveBaseShape..DefaultBox() settings).
 Also noticed a few other problems that I had to work around, so these need
 looking into.

---
 OpenSim/Region/Examples/SimpleApp/Program.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/Examples/SimpleApp/Program.cs')

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
         private LogBase m_log;
         AuthenticateSessionsBase m_circuitManager;
         uint m_localId;
+        public MyWorld world;
         
         private void Run()
         {
@@ -57,8 +58,9 @@ namespace SimpleApp
 
             RegionInfo regionInfo = new RegionInfo( 1000, 1000, internalEndPoint, "127.0.0.1" );
 
-            MyWorld world = new MyWorld(packetServer.ClientManager, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer);
+            world = new MyWorld(packetServer.ClientManager, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer);
             world.PhysScene = physManager.GetPhysicsScene("basicphysics");  //PhysicsScene.Null;
+            world.LoadWorldMap();
             udpServer.LocalWorld = world;
             
             httpServer.Start();
@@ -66,13 +68,16 @@ namespace SimpleApp
             m_log.WriteLine( LogPriority.NORMAL, "Press enter to quit.");
             m_log.ReadLine();
 
+
+            /*
             PrimitiveBaseShape shape = PrimitiveBaseShape.DefaultBox();
             
-            shape.Scale = new LLVector3(10, 10, 10);
+            shape.Scale = new LLVector3(0.5f, 0.5f, 0.5f);
             
-            LLVector3 pos = new LLVector3(128,128,72);
+            LLVector3 pos = new LLVector3(129,130,25);
 
-            world.AddNewPrim( LLUUID.Zero, pos, shape );
+            world.AddNewPrim( LLUUID.Random(), pos, shape );
+             */
 
         }
 
@@ -129,6 +134,7 @@ namespace SimpleApp
             Program app = new Program();
 
             app.Run();
+            
         }
     }
 }
-- 
cgit v1.1