diff options
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/ITerrainModule.cs')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/ITerrainModule.cs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs index 28f797a..3fc5ce7 100644 --- a/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs +++ b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs | |||
@@ -24,10 +24,9 @@ | |||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
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 | using System.IO; | ||
28 | 27 | ||
28 | using System.IO; | ||
29 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
30 | |||
31 | using OpenMetaverse; | 30 | using OpenMetaverse; |
32 | 31 | ||
33 | namespace OpenSim.Region.Framework.Interfaces | 32 | namespace OpenSim.Region.Framework.Interfaces |
@@ -43,13 +42,13 @@ namespace OpenSim.Region.Framework.Interfaces | |||
43 | /// Use this if you change terrain data outside of the terrain module (e.g. in osTerrainSetHeight) | 42 | /// Use this if you change terrain data outside of the terrain module (e.g. in osTerrainSetHeight) |
44 | /// </summary> | 43 | /// </summary> |
45 | void TaintTerrain(); | 44 | void TaintTerrain(); |
46 | 45 | ||
47 | /// <summary> | 46 | /// <summary> |
48 | /// When a client initially connects, all the terrain must be pushed to the viewer. | 47 | /// 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. | 48 | /// This call causes all the terrain patches to be sent to the client. |
50 | /// </summary> | 49 | /// </summary> |
51 | void PushTerrain(IClientAPI pClient); | 50 | void PushTerrain(IClientAPI pClient); |
52 | 51 | ||
53 | /// <summary> | 52 | /// <summary> |
54 | /// Load a terrain from a stream. | 53 | /// Load a terrain from a stream. |
55 | /// </summary> | 54 | /// </summary> |
@@ -58,8 +57,11 @@ namespace OpenSim.Region.Framework.Interfaces | |||
58 | /// </param> | 57 | /// </param> |
59 | /// <param name="stream"></param> | 58 | /// <param name="stream"></param> |
60 | void LoadFromStream(string filename, Stream stream); | 59 | void LoadFromStream(string filename, Stream stream); |
61 | void LoadFromStream(string filename, Vector3 displacement, float radianRotation, Vector2 rotationDisplacement, Stream stream); | ||
62 | void LoadFromStream(string filename, System.Uri pathToTerrainHeightmap); | 60 | void LoadFromStream(string filename, System.Uri pathToTerrainHeightmap); |
61 | void LoadFromStream(string filename, Vector3 displacement, | ||
62 | float radianRotation, Vector2 rotationDisplacement, Stream stream); | ||
63 | void LoadFromStream(string filename, Vector3 displacement, | ||
64 | float rotationDegress, Vector2 boundingOrigin, Vector2 boundingSize, Stream stream); | ||
63 | /// <summary> | 65 | /// <summary> |
64 | /// Save a terrain to a stream. | 66 | /// Save a terrain to a stream. |
65 | /// </summary> | 67 | /// </summary> |