From bf2f3ea29ab045cf8fe1e8223adb176e11c14569 Mon Sep 17 00:00:00 2001
From: MW
Date: Sun, 15 Jul 2007 21:10:05 +0000
Subject: Hijacked simpleApp again (sorry lbsa71, guess I should create my own
 simpleApp), to try out a basic test npc character(/class).

---
 OpenSim/Region/Examples/SimpleApp/Program.cs | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 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 82a62a3..0c688ba 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -15,6 +15,7 @@ using OpenSim.Region.Communications.Local;
 using OpenSim.Region.GridInterfaces.Local;
 using System.Timers;
 using OpenSim.Region.Environment.Scenes;
+using OpenSim.Framework.Data;
 
 namespace SimpleApp
 {
@@ -25,6 +26,7 @@ namespace SimpleApp
         uint m_localId;
         public MyWorld world;
         private SceneObject m_sceneObject;
+        public MyNpcCharacter m_character;
         
         private void Run()
         {
@@ -65,22 +67,35 @@ namespace SimpleApp
             world.PhysScene = physManager.GetPhysicsScene("basicphysics");  //PhysicsScene.Null;
 
             world.LoadWorldMap();
-            world.ParcelManager.NoParcelDataFromStorage();
+            world.PhysScene.SetTerrain(world.Terrain.getHeights1D());
 
             udpServer.LocalWorld = world;
 
             httpServer.Start();
             udpServer.ServerListener();
 
+            UserProfileData masterAvatar = communicationsManager.UserServer.SetupMasterUser("Test", "User", "test");
+            if (masterAvatar != null)
+            {
+                world.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID;
+                world.ParcelManager.NoParcelDataFromStorage();
+            }
+
             PrimitiveBaseShape shape = PrimitiveBaseShape.DefaultBox();
             shape.Scale = new LLVector3(0.5f, 0.5f, 0.5f);
-            LLVector3 pos = new LLVector3(129, 129, 27);
+            LLVector3 pos = new LLVector3(138, 129, 27);
+
+            m_sceneObject = new MySceneObject(world, world.EventManager, LLUUID.Zero, world.PrimIDAllocate(), pos, shape);
+            world.AddNewEntity(m_sceneObject);
+
+            m_character = new MyNpcCharacter();
+            world.AddNewClient(m_character, false);
+          
+             world.StartTimer();
 
-            m_sceneObject = new MySceneObject(world,world.EventManager, LLUUID.Zero, world.PrimIDAllocate(), pos, shape);
-            world.AddNewEntity(m_sceneObject);            
-            
             m_log.WriteLine(LogPriority.NORMAL, "Press enter to quit.");
             m_log.ReadLine();
+            
         }
 
         #region conscmd_callback Members
-- 
cgit v1.1