From 5a909a2054b17c74e23d608a401c0779a3072869 Mon Sep 17 00:00:00 2001
From: MW
Date: Sat, 14 Jul 2007 14:48:36 +0000
Subject: Set up parcel manager and the master avatar in SimpleApp.

---
 OpenSim/Region/Examples/SimpleApp/Program.cs | 31 +++++++++++++---------------
 1 file changed, 14 insertions(+), 17 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 42036eb..f30f444 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -13,6 +13,7 @@ using OpenSim.Region.Capabilities;
 using OpenSim.Region.ClientStack;
 using OpenSim.Region.Communications.Local;
 using OpenSim.Region.GridInterfaces.Local;
+using OpenSim.Framework.Data;
 
 namespace SimpleApp
 {
@@ -48,7 +49,7 @@ namespace SimpleApp
             
             UDPServer udpServer = new UDPServer( internalEndPoint.Port, assetCache, inventoryCache, m_log, m_circuitManager );
             PacketServer packetServer = new PacketServer(udpServer);
-            udpServer.ServerListener();
+           
             
             ClientView.TerrainManager = new TerrainManager(new SecondLife());
             BaseHttpServer httpServer = new BaseHttpServer(internalEndPoint.Port);
@@ -62,25 +63,22 @@ namespace SimpleApp
             world.PhysScene = physManager.GetPhysicsScene("basicphysics");  //PhysicsScene.Null;
             
             world.LoadWorldMap();
-            world.ParcelManager.NoParcelDataFromStorage();
             
             udpServer.LocalWorld = world;
-            
-            httpServer.Start();
-            
-            m_log.WriteLine( LogPriority.NORMAL, "Press enter to quit.");
-            m_log.ReadLine();
 
+            httpServer.Start();
+            udpServer.ServerListener();
 
-            /*
-            PrimitiveBaseShape shape = PrimitiveBaseShape.DefaultBox();
-            
-            shape.Scale = new LLVector3(0.5f, 0.5f, 0.5f);
-            
-            LLVector3 pos = new LLVector3(129,130,25);
+            UserProfileData masterAvatar = communicationsManager.UserServer.SetupMasterUser("Test", "User", "test");
+            if (masterAvatar != null)
+            {
+                world.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID;
+                world.ParcelManager.NoParcelDataFromStorage();
+            }
 
-            world.AddNewPrim( LLUUID.Random(), pos, shape );
-             */
+            world.CustomStartup();
+            m_log.WriteLine( LogPriority.NORMAL, "Press enter to quit.");
+            m_log.ReadLine();
 
         }
 
@@ -136,8 +134,7 @@ namespace SimpleApp
         {
             Program app = new Program();
 
-            app.Run();
-            
+            app.Run();     
         }
     }
 }
-- 
cgit v1.1