From 1a92dc907316b16e9664cc718a06a4203d9244df Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Sat, 14 Jul 2007 14:13:05 +0000
Subject: * 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)

---
 OpenSim/Region/Environment/Scenes/Scene.cs | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')

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;
         }
 
-- 
cgit v1.1