diff options
author | UbitUmarov | 2015-08-19 16:28:03 +0100 |
---|---|---|
committer | UbitUmarov | 2015-08-19 16:28:03 +0100 |
commit | 601914ecd807d9e36c0d9898562e730155a6051e (patch) | |
tree | b93d89ea35e9379971c9373622090aefef77e7d5 /OpenSim/Region | |
parent | minor change (diff) | |
download | opensim-SC-601914ecd807d9e36c0d9898562e730155a6051e.zip opensim-SC-601914ecd807d9e36c0d9898562e730155a6051e.tar.gz opensim-SC-601914ecd807d9e36c0d9898562e730155a6051e.tar.bz2 opensim-SC-601914ecd807d9e36c0d9898562e730155a6051e.tar.xz |
find sending of initial terrain using PushTerrain as os core
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/ITerrainModule.cs | 9 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneBase.cs | 7 |
2 files changed, 14 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs index 5947afb..4e2f4e1 100644 --- a/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs +++ b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs | |||
@@ -27,6 +27,7 @@ | |||
27 | 27 | ||
28 | 28 | ||
29 | using System.IO; | 29 | using System.IO; |
30 | using OpenSim.Framework; | ||
30 | using OpenMetaverse; | 31 | using OpenMetaverse; |
31 | 32 | ||
32 | namespace OpenSim.Region.Framework.Interfaces | 33 | namespace OpenSim.Region.Framework.Interfaces |
@@ -42,7 +43,13 @@ namespace OpenSim.Region.Framework.Interfaces | |||
42 | /// Use this if you change terrain data outside of the terrain module (e.g. in osTerrainSetHeight) | 43 | /// Use this if you change terrain data outside of the terrain module (e.g. in osTerrainSetHeight) |
43 | /// </summary> | 44 | /// </summary> |
44 | void TaintTerrain(); | 45 | void TaintTerrain(); |
45 | 46 | ||
47 | /// <summary> | ||
48 | /// When a client initially connects, all the terrain must be pushed to the viewer. | ||
49 | /// This call causes all the terrain patches to be sent to the client. | ||
50 | /// </summary> | ||
51 | void PushTerrain(IClientAPI pClient); | ||
52 | |||
46 | /// <summary> | 53 | /// <summary> |
47 | /// Load a terrain from a stream. | 54 | /// Load a terrain from a stream. |
48 | /// </summary> | 55 | /// </summary> |
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs index f5be7a7..9648030 100644 --- a/OpenSim/Region/Framework/Scenes/SceneBase.cs +++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs | |||
@@ -211,7 +211,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
211 | /// <param name="RemoteClient">Client to send to</param> | 211 | /// <param name="RemoteClient">Client to send to</param> |
212 | public virtual void SendLayerData(IClientAPI RemoteClient) | 212 | public virtual void SendLayerData(IClientAPI RemoteClient) |
213 | { | 213 | { |
214 | RemoteClient.SendLayerData(Heightmap.GetFloatsSerialised()); | 214 | // RemoteClient.SendLayerData(Heightmap.GetFloatsSerialised()); |
215 | ITerrainModule terrModule = RequestModuleInterface<ITerrainModule>(); | ||
216 | if (terrModule != null) | ||
217 | { | ||
218 | terrModule.PushTerrain(RemoteClient); | ||
219 | } | ||
215 | } | 220 | } |
216 | 221 | ||
217 | #endregion | 222 | #endregion |