aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorsacha2010-08-10 19:35:17 +0000
committersacha2010-08-10 19:35:17 +0000
commitd0a22fb359b8c911bff5a892d35e67ae9bb777a6 (patch)
tree7c60e5a9ce2e17dd25724e29001f0b65edb94579
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
downloadopensim-SC_OLD-d0a22fb359b8c911bff5a892d35e67ae9bb777a6.zip
opensim-SC_OLD-d0a22fb359b8c911bff5a892d35e67ae9bb777a6.tar.gz
opensim-SC_OLD-d0a22fb359b8c911bff5a892d35e67ae9bb777a6.tar.bz2
opensim-SC_OLD-d0a22fb359b8c911bff5a892d35e67ae9bb777a6.tar.xz
fixed ground texture issues ( it seems )
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs11
1 files changed, 9 insertions, 2 deletions
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
148 148
149 public void setEstateTerrainBaseTexture(IClientAPI remoteClient, int corner, UUID texture) 149 public void setEstateTerrainBaseTexture(IClientAPI remoteClient, int corner, UUID texture)
150 { 150 {
151 m_log.DebugFormat("[ESTATE]: sacha setting terrain texture change {0}, corner {1}",texture,corner);
151 if (texture == UUID.Zero) 152 if (texture == UUID.Zero)
152 return; 153 return;
153 154
@@ -166,8 +167,11 @@ namespace OpenSim.Region.CoreModules.World.Estate
166 m_scene.RegionInfo.RegionSettings.TerrainTexture4 = texture; 167 m_scene.RegionInfo.RegionSettings.TerrainTexture4 = texture;
167 break; 168 break;
168 } 169 }
170 m_log.DebugFormat("[ESTATE]: sacha step 2 {0}",texture);
169 m_scene.RegionInfo.RegionSettings.Save(); 171 m_scene.RegionInfo.RegionSettings.Save();
172 m_log.DebugFormat("[ESTATE]: sacha step 3 {0}",texture);
170 TriggerRegionInfoChange(); 173 TriggerRegionInfoChange();
174 m_log.DebugFormat("[ESTATE]: sacha step 4 {0}",texture);
171 sendRegionInfoPacketToAll(); 175 sendRegionInfoPacketToAll();
172 } 176 }
173 177
@@ -199,6 +203,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
199 203
200 private void handleCommitEstateTerrainTextureRequest(IClientAPI remoteClient) 204 private void handleCommitEstateTerrainTextureRequest(IClientAPI remoteClient)
201 { 205 {
206 m_log.Debug("[ESTATE]: sacha Commit terrain texture change");
202 sendRegionHandshakeToAll(); 207 sendRegionHandshakeToAll();
203 } 208 }
204 209
@@ -949,7 +954,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
949 break; 954 break;
950 } 955 }
951 m_scene.RegionInfo.RegionSettings.Save(); 956 m_scene.RegionInfo.RegionSettings.Save();
952 TriggerRegionInfoChange(); 957 //TriggerRegionInfoChange();
958 TriggerEstateInfoChange();
953 sendRegionInfoPacketToAll(); 959 sendRegionInfoPacketToAll();
954 960
955 } 961 }
@@ -995,7 +1001,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
995 break; 1001 break;
996 } 1002 }
997 m_scene.RegionInfo.RegionSettings.Save(); 1003 m_scene.RegionInfo.RegionSettings.Save();
998 TriggerRegionInfoChange(); 1004 //TriggerRegionInfoChange();
1005 TriggerEstateInfoChange();
999 sendRegionHandshakeToAll(); 1006 sendRegionHandshakeToAll();
1000 } 1007 }
1001 } 1008 }