Set up parcel manager and the master avatar in SimpleApp.

OpenSim/Region/Examples/SimpleApp/MyWorld.cs

@@ -8,13 +8,12 @@ using OpenSim.Framework.Types;
 using OpenSim.Region.Caches;
 using OpenSim.Region.Environment.Scenes;
 using OpenSim.Region.Terrain;
-using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence;
+using Avatar = OpenSim.Region.Environment.Scenes.ScenePresence;
 
 namespace SimpleApp
 {
     public class MyWorld : Scene
     {
-        private bool firstlogin = true;
         private List<ScenePresence> m_avatars;
 
         public MyWorld(ClientManager clientManager, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer)
@@ -58,10 +57,7 @@ namespace SimpleApp
         #region IWorld Members
 
         override public void AddNewClient(IClientAPI client, bool child)
-
         {
-            NewLoggin();
-
             LLVector3 pos = new LLVector3(128, 128, 128);
 
             client.OnRegionHandShakeReply += SendLayerData;
@@ -70,7 +66,7 @@ namespace SimpleApp
                 {
                     // Echo it (so you know what you typed)
                     client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
-                        client.SendChatMessage("Ready.", 1, pos, "System", LLUUID.Zero );
+                    client.SendChatMessage("Ready.", 1, pos, "System", LLUUID.Zero);
                 };
 
             client.OnAddPrim += AddNewPrim;
@@ -82,18 +78,16 @@ namespace SimpleApp
 
             client.OnCompleteMovementToRegion += delegate()
                  {
-                     client.SendChatMessage("Welcome to My World.", 1, pos, "System", LLUUID.Zero );
+                     client.SendChatMessage("Welcome to My World.", 1, pos, "System", LLUUID.Zero);
                  };
 
             client.SendRegionHandshake(m_regInfo);
 
-            ScenePresence avatar =CreateAndAddScenePresence(client);
+            ScenePresence avatar = CreateAndAddScenePresence(client);
             avatar.Pos = new LLVector3(128, 128, 26);
         }
 
-        public void NewLoggin()
-        {
-            if (firstlogin)
+        public void CustomStartup()
         {
             this.StartTimer();
 
@@ -103,8 +97,6 @@ namespace SimpleApp
             shape.Scale = new LLVector3(0.5f, 0.5f, 0.5f);
             LLVector3 pos1 = new LLVector3(129, 129, 27);
             AddNewPrim(LLUUID.Random(), pos1, shape);
-                firstlogin = false;
-            }
         }
 
         public override void Update()

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,26 +63,23 @@ namespace SimpleApp
             world.PhysScene = physManager.GetPhysicsScene("basicphysics");  //PhysicsScene.Null;
             
             world.LoadWorldMap();
-            world.ParcelManager.NoParcelDataFromStorage();
             
             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();
+            }
+
+            world.CustomStartup();
             m_log.WriteLine( LogPriority.NORMAL, "Press enter to quit.");
             m_log.ReadLine();
 
-
-            /*
-            PrimitiveBaseShape shape = PrimitiveBaseShape.DefaultBox();
-            
-            shape.Scale = new LLVector3(0.5f, 0.5f, 0.5f);
-            
-            LLVector3 pos = new LLVector3(129,130,25);
-
-            world.AddNewPrim( LLUUID.Random(), pos, shape );
-             */
-
         }
 
         private bool AddNewSessionHandler(ulong regionHandle, Login loginData)
@@ -137,7 +135,6 @@ namespace SimpleApp
             Program app = new Program();
 
             app.Run();     
-            
         }
     }
 }

OpenSim/Region/Examples/SimpleApp/PulseScript.cs

@@ -5,7 +5,7 @@ using OpenSim.Region.Scripting;
 using OpenSim.Region.Environment.Scenes;
 namespace SimpleApp
 {
-    public class PulseScript :IScript
+    public class PulseScript : IScript
     {
         ScriptInfo script;
 
@@ -29,7 +29,7 @@ namespace SimpleApp
 
         void events_OnFrame()
         {
-               foreach(EntityBase ent in this.script.world.Entities.Values)
+            foreach (EntityBase ent in this.script.world.Entities.Values)
             {
                 if (ent is SceneObject)
                 {
@@ -43,7 +43,7 @@ namespace SimpleApp
                         pulse = new libsecondlife.LLVector3(0.1f, 0.1f, 0.1f);
                     }
 
-                       prim.rootPrimitive.ResizeGoup( prim.rootPrimitive.Scale + pulse);
+                    prim.rootPrimitive.ResizeGoup(prim.rootPrimitive.Scale + pulse);
                 }
             }
         }

prebuild.xml

@@ -716,6 +716,7 @@
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.UserManagement"/>
+      <Reference name="OpenSim.Framework.Data"/>
       <Reference name="OpenSim.Region.Physics.Manager"/>
       <Reference name="OpenSim.Region.Capabilities"/>
       <Reference name="XMLRPC.dll"/>