diff options
| author | Melanie | 2014-02-04 01:55:41 +0000 |
|---|---|---|
| committer | Melanie | 2014-02-04 01:55:41 +0000 |
| commit | e1d1c279651784d7290241b8c4b416bc4c96ab3c (patch) | |
| tree | 0a6f258ff2612b0faaf6aceadaa7be09b1f0386e /OpenSim/Region/Framework/Interfaces/ITerrainModule.cs | |
| parent | Dropping the rest of Avination's modified appearance code for core. (diff) | |
| parent | Add "--no-objects" parameter to 'load oar'. (diff) | |
| download | opensim-SC-e1d1c279651784d7290241b8c4b416bc4c96ab3c.zip opensim-SC-e1d1c279651784d7290241b8c4b416bc4c96ab3c.tar.gz opensim-SC-e1d1c279651784d7290241b8c4b416bc4c96ab3c.tar.bz2 opensim-SC-e1d1c279651784d7290241b8c4b416bc4c96ab3c.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/ITerrainModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs index 189a30a..a6f5d98 100644 --- a/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs +++ b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs | |||
| @@ -51,7 +51,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 51 | /// </param> | 51 | /// </param> |
| 52 | /// <param name="stream"></param> | 52 | /// <param name="stream"></param> |
| 53 | void LoadFromStream(string filename, Stream stream); | 53 | void LoadFromStream(string filename, Stream stream); |
| 54 | void LoadFromStream(string filename, Vector2 displacement, Stream stream); | 54 | void LoadFromStream(string filename, Vector3 displacement, float radianRotation, Vector2 rotationDisplacement, Stream stream); |
| 55 | void LoadFromStream(string filename, System.Uri pathToTerrainHeightmap); | 55 | void LoadFromStream(string filename, System.Uri pathToTerrainHeightmap); |
| 56 | /// <summary> | 56 | /// <summary> |
| 57 | /// Save a terrain to a stream. | 57 | /// Save a terrain to a stream. |