diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs index dfafcad..118c8f8 100644 --- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs | |||
@@ -229,11 +229,11 @@ namespace OpenSim.Region.CoreModules.World.Terrain | |||
229 | } | 229 | } |
230 | 230 | ||
231 | m_scene.RegisterModuleInterface<ITerrainModule>(this); | 231 | m_scene.RegisterModuleInterface<ITerrainModule>(this); |
232 | m_scene.EventManager.OnFrame += EventManager_OnFrame; | ||
232 | m_scene.EventManager.OnNewClient += EventManager_OnNewClient; | 233 | m_scene.EventManager.OnNewClient += EventManager_OnNewClient; |
233 | m_scene.EventManager.OnClientClosed += EventManager_OnClientClosed; | 234 | m_scene.EventManager.OnClientClosed += EventManager_OnClientClosed; |
234 | m_scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole; | 235 | m_scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole; |
235 | m_scene.EventManager.OnTerrainTick += EventManager_OnTerrainTick; | 236 | m_scene.EventManager.OnTerrainTick += EventManager_OnTerrainTick; |
236 | m_scene.EventManager.OnFrame += EventManager_OnFrame; | ||
237 | } | 237 | } |
238 | 238 | ||
239 | InstallDefaultEffects(); | 239 | InstallDefaultEffects(); |
@@ -767,6 +767,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain | |||
767 | /// </summary> | 767 | /// </summary> |
768 | private void EventManager_OnFrame() | 768 | private void EventManager_OnFrame() |
769 | { | 769 | { |
770 | // this needs fixing | ||
770 | TerrainData terrData = m_channel.GetTerrainData(); | 771 | TerrainData terrData = m_channel.GetTerrainData(); |
771 | 772 | ||
772 | bool shouldTaint = false; | 773 | bool shouldTaint = false; |
@@ -792,6 +793,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain | |||
792 | m_scene.EventManager.TriggerTerrainTainted(); | 793 | m_scene.EventManager.TriggerTerrainTainted(); |
793 | m_tainted = true; | 794 | m_tainted = true; |
794 | } | 795 | } |
796 | |||
795 | } | 797 | } |
796 | 798 | ||
797 | /// <summary> | 799 | /// <summary> |
@@ -993,6 +995,10 @@ namespace OpenSim.Region.CoreModules.World.Terrain | |||
993 | { | 995 | { |
994 | foreach (PatchUpdates pups in m_perClientPatchUpdates.Values) | 996 | foreach (PatchUpdates pups in m_perClientPatchUpdates.Values) |
995 | { | 997 | { |
998 | // throught acording to land queue free to send bytes | ||
999 | if (!pups.Presence.ControllingClient.CanSendLayerData()) | ||
1000 | continue; | ||
1001 | |||
996 | if (pups.HasUpdates()) | 1002 | if (pups.HasUpdates()) |
997 | { | 1003 | { |
998 | // There is something that could be sent to this client. | 1004 | // There is something that could be sent to this client. |