3 files changed, 18 insertions, 23 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index 350990e..ae37790 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -89,7 +89,7 @@ namespace OpenSim.Region.Environment.Scenes
                         {
                             ((SceneObjectGroup) ent).GetProperties(remoteClient);
                             ((SceneObjectGroup) ent).IsSelected = true;
-                            LandChannel.setPrimsTainted();
+                            LandChannel.SetPrimsTainted();
                         }
                         break;
                     }
@@ -115,7 +115,7 @@ namespace OpenSim.Region.Environment.Scenes
                         if (Permissions.CanEditObjectPosition(remoteClient.AgentId, ((SceneObjectGroup)ent).UUID) || Permissions.CanEditObject(remoteClient.AgentId, ((SceneObjectGroup)ent).UUID))
                         {
                             ((SceneObjectGroup) ent).IsSelected = false;
-                            LandChannel.setPrimsTainted();
+                            LandChannel.SetPrimsTainted();
                             break;
                         }
                     }
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index a703622..a875051 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -799,9 +799,9 @@ namespace OpenSim.Region.Environment.Scenes
         {
             if (LandChannel != null)
             {
-                if (LandChannel.isLandPrimCountTainted())
+                if (LandChannel.IsLandPrimCountTainted())
                 {
-                    LandChannel.performParcelPrimCountUpdate();
+                    LandChannel.PerformParcelPrimCountUpdate();
                 }
             }
         }
@@ -937,12 +937,12 @@ namespace OpenSim.Region.Environment.Scenes
                 if (dGridSettings["allow_forceful_banlines"] != "TRUE")
                 {
                     m_log.Info("[GRID]: Grid is disabling forceful parcel banlists");
-                    LandChannel.allowedForcefulBans = false;
+                    LandChannel.AllowedForcefulBans = false;
                 }
                 else
                 {
                     m_log.Info("[GRID]: Grid is allowing forceful parcel banlists");
-                    LandChannel.allowedForcefulBans = true;
+                    LandChannel.AllowedForcefulBans = true;
                 }
             }
         }
@@ -1305,9 +1305,9 @@ namespace OpenSim.Region.Environment.Scenes
         {
             if (Entities.ContainsKey(sceneObject.UUID))
             {
-                LandChannel.removePrimFromLandPrimCounts(sceneObject);
+                LandChannel.RemovePrimFromLandPrimCounts(sceneObject);
                 Entities.Remove(sceneObject.UUID);
-                LandChannel.setPrimsTainted();
+                LandChannel.SetPrimsTainted();
                 m_innerScene.RemoveAPrimCount();
             }
         }
@@ -1318,7 +1318,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="prim"></param>
         public void AcknowledgeNewPrim(SceneObjectGroup prim)
         {
-            prim.OnPrimCountTainted += LandChannel.setPrimsTainted;
+            prim.OnPrimCountTainted += LandChannel.SetPrimsTainted;
         }
 
         public void LoadPrimsFromXml(string fileName, bool newIdsFlag, LLVector3 loadOffset)
@@ -1525,7 +1525,7 @@ namespace OpenSim.Region.Environment.Scenes
 
                 CreateAndAddScenePresence(client, child);
 
-                LandChannel.sendParcelOverlay(client);
+                LandChannel.SendParcelOverlay(client);
                 CommsManager.UserProfileCacheService.AddNewUser(client.AgentId);
             }
         }
@@ -1741,11 +1741,6 @@ namespace OpenSim.Region.Environment.Scenes
 
             ScenePresence avatar = m_innerScene.CreateAndAddScenePresence(client, child, appearance);
 
-            if (avatar.IsChildAgent)
-            {
-                avatar.OnSignificantClientMovement += LandChannel.handleSignificantClientMovement;
-            }
-
             return avatar;
         }
 
@@ -1984,7 +1979,7 @@ namespace OpenSim.Region.Environment.Scenes
                     AddCapsHandler(agent.AgentID);
 
                     // Honor parcel landing type and position.
-                    ILandObject land = LandChannel.getLandObject(agent.startpos.X, agent.startpos.Y);
+                    ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y);
                     if (land != null)
                     {
                         if (land.landData.landingType == (byte)1 && land.landData.userLocation != LLVector3.Zero)
@@ -2803,7 +2798,7 @@ namespace OpenSim.Region.Environment.Scenes
 
         public LLUUID GetLandOwner(float x, float y)
         {
-            ILandObject land = LandChannel.getLandObject(x, y);
+            ILandObject land = LandChannel.GetLandObject(x, y);
             if (land == null)
             {
                 return LLUUID.Zero;
@@ -2816,12 +2811,12 @@ namespace OpenSim.Region.Environment.Scenes
 
         public LandData GetLandData(float x, float y)
         {
-            return LandChannel.getLandObject(x, y).landData;
+            return LandChannel.GetLandObject(x, y).landData;
         }
 
         public void SetLandMusicURL(float x, float y, string url)
         {
-            ILandObject land = LandChannel.getLandObject(x, y);
+            ILandObject land = LandChannel.GetLandObject(x, y);
             if (land == null)
             {
                 return;
@@ -2835,7 +2830,7 @@ namespace OpenSim.Region.Environment.Scenes
 
         public void SetLandMediaURL(float x, float y, string url)
         {
-            ILandObject land = LandChannel.getLandObject(x, y);
+            ILandObject land = LandChannel.GetLandObject(x, y);
 
             if (land == null)
             {
@@ -2885,7 +2880,7 @@ namespace OpenSim.Region.Environment.Scenes
 
         private bool scriptDanger(SceneObjectPart part,LLVector3 pos)
         {
-            ILandObject parcel = LandChannel.getLandObject(pos.X, pos.Y);
+            ILandObject parcel = LandChannel.GetLandObject(pos.X, pos.Y);
             if (part != null)
             {
                 if (parcel != null)
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 2e6fe3d..66363b7 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -414,7 +414,7 @@ namespace OpenSim.Region.Environment.Scenes
             RegisterToEvents();
             SetDirectionVectors();
 
-            m_scene.LandChannel.sendLandUpdate(this, true);
+            m_scene.LandChannel.SendLandUpdate(this, true);
         }
 
         public ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo, byte[] visualParams,
@@ -597,7 +597,7 @@ namespace OpenSim.Region.Environment.Scenes
             //if (!m_gotAllObjectsInScene)
             //{
             m_scene.SendAllSceneObjectsToClient(this);
-            m_scene.LandChannel.sendLandUpdate(this, true);
+            m_scene.LandChannel.SendLandUpdate(this, true);
             
             //m_gotAllObjectsInScene = true;
             //}