* Apparently, we need to tell ParcelManager that there is no parcels.

* Cleaning lady cleaning build ignores (No, MW, I don't mind, anything for you)

4 files changed, 19 insertions, 10 deletions

diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 48997e2..8367fd0 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -230,7 +230,7 @@ namespace OpenSim
                 if (masterAvatar != null)

                 {

                     LocalWorld.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID;

-                    LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.parcelManager);

+                    LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.ParcelManager);

                 }

 

                 LocalWorld.StartTimer();

diff --git a/OpenSim/Region/Environment/ParcelManager.cs b/OpenSim/Region/Environment/ParcelManager.cs
index 07f39fd..b9c4067 100644
--- a/OpenSim/Region/Environment/ParcelManager.cs
+++ b/OpenSim/Region/Environment/ParcelManager.cs
@@ -664,7 +664,7 @@ namespace OpenSim.Region.Environment
             List<Avatar> avatars = m_world.RequestAvatarList();

             for (int i = 0; i < avatars.Count; i++)

             {

-                Parcel over = m_world.parcelManager.getParcel((int)Math.Round(avatars[i].Pos.X), (int)Math.Round(avatars[i].Pos.Y));

+                Parcel over = m_world.ParcelManager.getParcel((int)Math.Round(avatars[i].Pos.X), (int)Math.Round(avatars[i].Pos.Y));

                 if (over.parcelData.localID == this.parcelData.localID)

                 {

                     sendParcelProperties(0, false, 0, avatars[i].ControllingClient);

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 737e8fe..6a4b735 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -68,7 +68,6 @@ namespace OpenSim.Region.Environment.Scenes
         protected Dictionary<LLUUID, Caps> capsHandlers = new Dictionary<LLUUID, Caps>();

         protected BaseHttpServer httpListener;

 

-        public ParcelManager parcelManager;

         public EstateManager estateManager;

         public EventManager eventManager;

         public ScriptManager scriptManager;

@@ -89,6 +88,13 @@ namespace OpenSim.Region.Environment.Scenes
             }

         }

 

+        private ParcelManager m_parcelManager;

+

+        public ParcelManager ParcelManager

+        {

+            get { return m_parcelManager; }

+        }

+

         #endregion

 

         #region Constructors

@@ -111,7 +117,7 @@ namespace OpenSim.Region.Environment.Scenes
             this.m_datastore = m_regInfo.DataStore;

             this.RegisterRegionWithComms();

 

-            parcelManager = new ParcelManager(this, this.m_regInfo);

+            m_parcelManager = new ParcelManager(this, this.m_regInfo);

             estateManager = new EstateManager(this, this.m_regInfo);

             scriptManager = new ScriptManager(this);

             eventManager = new EventManager();

@@ -449,7 +455,7 @@ namespace OpenSim.Region.Environment.Scenes
             SubscribeToClientEvents(client);

             this.estateManager.sendRegionHandshake(client);

             CreateAndAddScenePresence(client);

-            this.parcelManager.sendParcelOverlay(client);

+            this.m_parcelManager.sendParcelOverlay(client);

             

         }

 

@@ -479,10 +485,10 @@ namespace OpenSim.Region.Environment.Scenes
             client.OnLinkObjects += this.LinkObjects;

             client.OnObjectDuplicate += this.DuplicateObject;

             

-            client.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest);

-            client.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest);

-            client.OnParcelJoinRequest += new ParcelJoinRequest(parcelManager.handleParcelJoinRequest);

-            client.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest);

+            client.OnParcelPropertiesRequest += new ParcelPropertiesRequest(m_parcelManager.handleParcelPropertiesRequest);

+            client.OnParcelDivideRequest += new ParcelDivideRequest(m_parcelManager.handleParcelDivideRequest);

+            client.OnParcelJoinRequest += new ParcelJoinRequest(m_parcelManager.handleParcelJoinRequest);

+            client.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(m_parcelManager.handleParcelPropertiesUpdateRequest);

             client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage);

 

         }

@@ -524,7 +530,7 @@ namespace OpenSim.Region.Environment.Scenes
                     this.Avatars.Add(client.AgentId, newAvatar);

                 }

             }

-            newAvatar.OnSignificantClientMovement += parcelManager.handleSignificantClientMovement;

+            newAvatar.OnSignificantClientMovement += m_parcelManager.handleSignificantClientMovement;

             return newAvatar;

         }

 

diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index 3723c3d..42036eb 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -60,7 +60,10 @@ namespace SimpleApp
 

             world = new MyWorld(packetServer.ClientManager, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer);

             world.PhysScene = physManager.GetPhysicsScene("basicphysics");  //PhysicsScene.Null;

+            

             world.LoadWorldMap();

+            world.ParcelManager.NoParcelDataFromStorage();

+            

             udpServer.LocalWorld = world;

             

             httpServer.Start();