aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorHomer Horwitz2009-04-19 13:33:46 +0000
committerHomer Horwitz2009-04-19 13:33:46 +0000
commit9c3ec87b976edb37114a489ce83b1e8f8e9a6851 (patch)
treef959012150e6bffae5e7874fef9b9e089f0f1abc
parentKeep IsColliding updated for the recent changes in ScenePresence so that walk... (diff)
downloadopensim-SC_OLD-9c3ec87b976edb37114a489ce83b1e8f8e9a6851.zip
opensim-SC_OLD-9c3ec87b976edb37114a489ce83b1e8f8e9a6851.tar.gz
opensim-SC_OLD-9c3ec87b976edb37114a489ce83b1e8f8e9a6851.tar.bz2
opensim-SC_OLD-9c3ec87b976edb37114a489ce83b1e8f8e9a6851.tar.xz
Moved ITerrainModule and ITerainEffect to OpenSim.Region.Framework.Interfaces and added a TaintTerrain method
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs9
-rw-r--r--OpenSim/Region/Framework/Interfaces/ITerrainEffect.cs (renamed from OpenSim/Region/CoreModules/World/Terrain/ITerrainEffect.cs)4
-rw-r--r--OpenSim/Region/Framework/Interfaces/ITerrainModule.cs (renamed from OpenSim/Region/CoreModules/World/Terrain/ITerrainModule.cs)8
3 files changed, 16 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index 5893a11..045fbb1 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -82,7 +82,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
82 private Dictionary<string, ITerrainEffect> m_plugineffects; 82 private Dictionary<string, ITerrainEffect> m_plugineffects;
83 private ITerrainChannel m_revert; 83 private ITerrainChannel m_revert;
84 private Scene m_scene; 84 private Scene m_scene;
85 private bool m_tainted; 85 private volatile bool m_tainted;
86 86
87 #region ICommandableModule Members 87 #region ICommandableModule Members
88 88
@@ -327,6 +327,11 @@ namespace OpenSim.Region.CoreModules.World.Terrain
327 } 327 }
328 } 328 }
329 329
330 public void TaintTerrain ()
331 {
332 CheckForTerrainUpdates();
333 }
334
330 #region Plugin Loading Methods 335 #region Plugin Loading Methods
331 336
332 private void LoadPlugins() 337 private void LoadPlugins()
@@ -1080,6 +1085,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain
1080 m_scene.RegisterModuleCommander(m_commander); 1085 m_scene.RegisterModuleCommander(m_commander);
1081 } 1086 }
1082 1087
1088
1083 #endregion 1089 #endregion
1090
1084 } 1091 }
1085} 1092}
diff --git a/OpenSim/Region/CoreModules/World/Terrain/ITerrainEffect.cs b/OpenSim/Region/Framework/Interfaces/ITerrainEffect.cs
index 40b9f5a..454aaaa 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/ITerrainEffect.cs
+++ b/OpenSim/Region/Framework/Interfaces/ITerrainEffect.cs
@@ -25,9 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using OpenSim.Region.Framework.Interfaces; 28namespace OpenSim.Region.Framework.Interfaces
29
30namespace OpenSim.Region.CoreModules.World.Terrain
31{ 29{
32 public interface ITerrainEffect 30 public interface ITerrainEffect
33 { 31 {
diff --git a/OpenSim/Region/CoreModules/World/Terrain/ITerrainModule.cs b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs
index 9ca7de0..378a80d 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/ITerrainModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs
@@ -29,13 +29,19 @@
29using System.IO; 29using System.IO;
30using OpenMetaverse; 30using OpenMetaverse;
31 31
32namespace OpenSim.Region.CoreModules.World.Terrain 32namespace OpenSim.Region.Framework.Interfaces
33{ 33{
34 public interface ITerrainModule 34 public interface ITerrainModule
35 { 35 {
36 void LoadFromFile(string filename); 36 void LoadFromFile(string filename);
37 void SaveToFile(string filename); 37 void SaveToFile(string filename);
38 void ModifyTerrain(UUID user, Vector3 pos, byte size, byte action, UUID agentId); 38 void ModifyTerrain(UUID user, Vector3 pos, byte size, byte action, UUID agentId);
39
40 /// <summary>
41 /// Taint the terrain. This will lead to sending the terrain data to the clients again.
42 /// Use this if you change terrain data outside of the terrain module (e.g. in osTerrainSetHeight)
43 /// </summary>
44 void TaintTerrain();
39 45
40 /// <summary> 46 /// <summary>
41 /// Load a terrain from a stream. 47 /// Load a terrain from a stream.