diff options
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/ITerrainModule.cs')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/ITerrainModule.cs | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs index 28f797a..ff18519 100644 --- a/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs +++ b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs | |||
@@ -28,6 +28,11 @@ using System.IO; | |||
28 | 28 | ||
29 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
30 | 30 | ||
31 | <<<<<<< HEAD | ||
32 | ======= | ||
33 | using System.IO; | ||
34 | using OpenSim.Framework; | ||
35 | >>>>>>> avn/ubitvar | ||
31 | using OpenMetaverse; | 36 | using OpenMetaverse; |
32 | 37 | ||
33 | namespace OpenSim.Region.Framework.Interfaces | 38 | namespace OpenSim.Region.Framework.Interfaces |
@@ -43,7 +48,13 @@ namespace OpenSim.Region.Framework.Interfaces | |||
43 | /// Use this if you change terrain data outside of the terrain module (e.g. in osTerrainSetHeight) | 48 | /// Use this if you change terrain data outside of the terrain module (e.g. in osTerrainSetHeight) |
44 | /// </summary> | 49 | /// </summary> |
45 | void TaintTerrain(); | 50 | void TaintTerrain(); |
46 | 51 | ||
52 | /// <summary> | ||
53 | /// When a client initially connects, all the terrain must be pushed to the viewer. | ||
54 | /// This call causes all the terrain patches to be sent to the client. | ||
55 | /// </summary> | ||
56 | void PushTerrain(IClientAPI pClient); | ||
57 | |||
47 | /// <summary> | 58 | /// <summary> |
48 | /// When a client initially connects, all the terrain must be pushed to the viewer. | 59 | /// 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. | 60 | /// This call causes all the terrain patches to be sent to the client. |
@@ -60,6 +71,8 @@ namespace OpenSim.Region.Framework.Interfaces | |||
60 | void LoadFromStream(string filename, Stream stream); | 71 | void LoadFromStream(string filename, Stream stream); |
61 | void LoadFromStream(string filename, Vector3 displacement, float radianRotation, Vector2 rotationDisplacement, Stream stream); | 72 | void LoadFromStream(string filename, Vector3 displacement, float radianRotation, Vector2 rotationDisplacement, Stream stream); |
62 | void LoadFromStream(string filename, System.Uri pathToTerrainHeightmap); | 73 | void LoadFromStream(string filename, System.Uri pathToTerrainHeightmap); |
74 | void LoadFromStream(string filename, Vector3 displacement, | ||
75 | float radianRotation, Vector2 rotationDisplacement, Stream stream); | ||
63 | /// <summary> | 76 | /// <summary> |
64 | /// Save a terrain to a stream. | 77 | /// Save a terrain to a stream. |
65 | /// </summary> | 78 | /// </summary> |