From d0a22fb359b8c911bff5a892d35e67ae9bb777a6 Mon Sep 17 00:00:00 2001
From: sacha
Date: Tue, 10 Aug 2010 19:35:17 +0000
Subject: fixed ground texture issues ( it seems )

---
 .../Region/CoreModules/World/Estate/EstateManagementModule.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index ee151da..849daea 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -148,6 +148,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         public void setEstateTerrainBaseTexture(IClientAPI remoteClient, int corner, UUID texture)
         {
+            m_log.DebugFormat("[ESTATE]: sacha setting terrain texture change {0}, corner {1}",texture,corner);
             if (texture == UUID.Zero)
                 return;
 
@@ -166,8 +167,11 @@ namespace OpenSim.Region.CoreModules.World.Estate
                     m_scene.RegionInfo.RegionSettings.TerrainTexture4 = texture;
                     break;
             }
+            m_log.DebugFormat("[ESTATE]: sacha step 2 {0}",texture);
             m_scene.RegionInfo.RegionSettings.Save();
+            m_log.DebugFormat("[ESTATE]: sacha step 3 {0}",texture);
             TriggerRegionInfoChange();
+            m_log.DebugFormat("[ESTATE]: sacha step 4 {0}",texture);
             sendRegionInfoPacketToAll();
         }
 
@@ -199,6 +203,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         private void handleCommitEstateTerrainTextureRequest(IClientAPI remoteClient)
         {
+            m_log.Debug("[ESTATE]: sacha Commit terrain texture change");
             sendRegionHandshakeToAll();
         }
 
@@ -949,7 +954,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
                             break;
                     }
                     m_scene.RegionInfo.RegionSettings.Save();
-                    TriggerRegionInfoChange();
+                    //TriggerRegionInfoChange();
+                    TriggerEstateInfoChange();
                     sendRegionInfoPacketToAll();
 
                 }
@@ -995,7 +1001,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
                             break;
                     }
                     m_scene.RegionInfo.RegionSettings.Save();
-                    TriggerRegionInfoChange();
+                    //TriggerRegionInfoChange();
+                    TriggerEstateInfoChange();
                     sendRegionHandshakeToAll();
                 }
             }
-- 
cgit v1.1


From 7fead01786a6bc406081d026c5909f8277b77aa5 Mon Sep 17 00:00:00 2001
From: sacha
Date: Tue, 10 Aug 2010 19:43:32 +0000
Subject: remoning debug messages

---
 OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 849daea..c6a1614 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -148,7 +148,6 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         public void setEstateTerrainBaseTexture(IClientAPI remoteClient, int corner, UUID texture)
         {
-            m_log.DebugFormat("[ESTATE]: sacha setting terrain texture change {0}, corner {1}",texture,corner);
             if (texture == UUID.Zero)
                 return;
 
@@ -167,11 +166,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
                     m_scene.RegionInfo.RegionSettings.TerrainTexture4 = texture;
                     break;
             }
-            m_log.DebugFormat("[ESTATE]: sacha step 2 {0}",texture);
             m_scene.RegionInfo.RegionSettings.Save();
-            m_log.DebugFormat("[ESTATE]: sacha step 3 {0}",texture);
             TriggerRegionInfoChange();
-            m_log.DebugFormat("[ESTATE]: sacha step 4 {0}",texture);
             sendRegionInfoPacketToAll();
         }
 
@@ -203,7 +199,6 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         private void handleCommitEstateTerrainTextureRequest(IClientAPI remoteClient)
         {
-            m_log.Debug("[ESTATE]: sacha Commit terrain texture change");
             sendRegionHandshakeToAll();
         }
 
-- 
cgit v1.1