diff options
| author | Robert Adams | 2014-02-02 11:17:49 -0800 |
|---|---|---|
| committer | Robert Adams | 2014-02-02 11:17:49 -0800 |
| commit | 9c97fb8e127e91d48cf92eeed238cf80878e2286 (patch) | |
| tree | a0d00a1707f45121137d210f18b8b9525cc3ab48 /OpenSim/Region/Framework/Interfaces/ITerrainModule.cs | |
| parent | Overload INPCModule.CreateNPC() to allow agentID to be specified. Note: this ... (diff) | |
| download | opensim-SC-9c97fb8e127e91d48cf92eeed238cf80878e2286.zip opensim-SC-9c97fb8e127e91d48cf92eeed238cf80878e2286.tar.gz opensim-SC-9c97fb8e127e91d48cf92eeed238cf80878e2286.tar.bz2 opensim-SC-9c97fb8e127e91d48cf92eeed238cf80878e2286.tar.xz | |
Implement terrain merging in TerrainChannel.
Modify archiver to use terrain merging when loading oars.
This makes displacement AND rotation properly work on terrain when loading oars.
Especially useful when loading legacy region oars into large varregions.
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. |