aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
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/CoreModules
parentminor: remove mono compiler warning (diff)
downloadopensim-SC-5d20f04e08c65b37bbdda187c30ce038872307ab.zip
opensim-SC-5d20f04e08c65b37bbdda187c30ce038872307ab.tar.gz
opensim-SC-5d20f04e08c65b37bbdda187c30ce038872307ab.tar.bz2
opensim-SC-5d20f04e08c65b37bbdda187c30ce038872307ab.tar.xz
refactor: move Scene.TerrainUnAcked() handling into TerrainModule
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs9
1 files changed, 8 insertions, 1 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 {