aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-08-13 21:18:26 +0100
committerJustin Clark-Casey (justincc)2010-08-13 21:18:26 +0100
commit5d20f04e08c65b37bbdda187c30ce038872307ab (patch)
tree5c036469c17cc03b8498807c545a2817bd0672f3 /OpenSim/Region
parentminor: remove mono compiler warning (diff)
downloadopensim-SC_OLD-5d20f04e08c65b37bbdda187c30ce038872307ab.zip
opensim-SC_OLD-5d20f04e08c65b37bbdda187c30ce038872307ab.tar.gz
opensim-SC_OLD-5d20f04e08c65b37bbdda187c30ce038872307ab.tar.bz2
opensim-SC_OLD-5d20f04e08c65b37bbdda187c30ce038872307ab.tar.xz
refactor: move Scene.TerrainUnAcked() handling into TerrainModule
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs9
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs8
2 files changed, 8 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index 2c5e444..cb80111 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -586,8 +586,9 @@ namespace OpenSim.Region.CoreModules.World.Terrain
586 client.OnModifyTerrain += client_OnModifyTerrain; 586 client.OnModifyTerrain += client_OnModifyTerrain;
587 client.OnBakeTerrain += client_OnBakeTerrain; 587 client.OnBakeTerrain += client_OnBakeTerrain;
588 client.OnLandUndo += client_OnLandUndo; 588 client.OnLandUndo += client_OnLandUndo;
589 client.OnUnackedTerrain += client_OnUnackedTerrain;
589 } 590 }
590 591
591 /// <summary> 592 /// <summary>
592 /// Checks to see if the terrain has been modified since last check 593 /// Checks to see if the terrain has been modified since last check
593 /// but won't attempt to limit those changes to the limits specified in the estate settings 594 /// but won't attempt to limit those changes to the limits specified in the estate settings
@@ -808,6 +809,12 @@ namespace OpenSim.Region.CoreModules.World.Terrain
808 InterfaceBakeTerrain(null); //bake terrain does not use the passed in parameter 809 InterfaceBakeTerrain(null); //bake terrain does not use the passed in parameter
809 } 810 }
810 } 811 }
812
813 protected void client_OnUnackedTerrain(IClientAPI client, int patchX, int patchY)
814 {
815 //m_log.Debug("Terrain packet unacked, resending patch: " + patchX + " , " + patchY);
816 client.SendLayerData(patchX, patchY, m_scene.Heightmap.GetFloatsSerialised());
817 }
811 818
812 private void StoreUndoState() 819 private void StoreUndoState()
813 { 820 {
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 631046a..50f6b71 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2770,7 +2770,6 @@ namespace OpenSim.Region.Framework.Scenes
2770 public virtual void SubscribeToClientTerrainEvents(IClientAPI client) 2770 public virtual void SubscribeToClientTerrainEvents(IClientAPI client)
2771 { 2771 {
2772 client.OnRegionHandShakeReply += SendLayerData; 2772 client.OnRegionHandShakeReply += SendLayerData;
2773 client.OnUnackedTerrain += TerrainUnAcked;
2774 } 2773 }
2775 2774
2776 public virtual void SubscribeToClientPrimEvents(IClientAPI client) 2775 public virtual void SubscribeToClientPrimEvents(IClientAPI client)
@@ -2901,7 +2900,6 @@ namespace OpenSim.Region.Framework.Scenes
2901 public virtual void UnSubscribeToClientTerrainEvents(IClientAPI client) 2900 public virtual void UnSubscribeToClientTerrainEvents(IClientAPI client)
2902 { 2901 {
2903 client.OnRegionHandShakeReply -= SendLayerData; 2902 client.OnRegionHandShakeReply -= SendLayerData;
2904 client.OnUnackedTerrain -= TerrainUnAcked;
2905 } 2903 }
2906 2904
2907 public virtual void UnSubscribeToClientPrimEvents(IClientAPI client) 2905 public virtual void UnSubscribeToClientPrimEvents(IClientAPI client)
@@ -4481,12 +4479,6 @@ namespace OpenSim.Region.Framework.Scenes
4481 client.SendRegionHandle(regionID, handle); 4479 client.SendRegionHandle(regionID, handle);
4482 } 4480 }
4483 4481
4484 public void TerrainUnAcked(IClientAPI client, int patchX, int patchY)
4485 {
4486 //m_log.Debug("Terrain packet unacked, resending patch: " + patchX + " , " + patchY);
4487 client.SendLayerData(patchX, patchY, Heightmap.GetFloatsSerialised());
4488 }
4489
4490 public bool NeedSceneCacheClear(UUID agentID) 4482 public bool NeedSceneCacheClear(UUID agentID)
4491 { 4483 {
4492 IInventoryTransferModule inv = RequestModuleInterface<IInventoryTransferModule>(); 4484 IInventoryTransferModule inv = RequestModuleInterface<IInventoryTransferModule>();