1 files changed, 14 insertions, 17 deletions

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();     

         }

     }

 }