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/ITerrainChannel.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 'OpenSim/Region/Framework/Interfaces/ITerrainChannel.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/ITerrainChannel.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/ITerrainChannel.cs b/OpenSim/Region/Framework/Interfaces/ITerrainChannel.cs index 469bd31..f660b8d 100644 --- a/OpenSim/Region/Framework/Interfaces/ITerrainChannel.cs +++ b/OpenSim/Region/Framework/Interfaces/ITerrainChannel.cs | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | using OpenSim.Framework; | 28 | using OpenSim.Framework; |
| 29 | using OpenMetaverse; | ||
| 29 | 30 | ||
| 30 | namespace OpenSim.Region.Framework.Interfaces | 31 | namespace OpenSim.Region.Framework.Interfaces |
| 31 | { | 32 | { |
| @@ -56,5 +57,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 56 | ITerrainChannel MakeCopy(); | 57 | ITerrainChannel MakeCopy(); |
| 57 | string SaveToXmlString(); | 58 | string SaveToXmlString(); |
| 58 | void LoadFromXmlString(string data); | 59 | void LoadFromXmlString(string data); |
| 60 | // Merge some terrain into this channel | ||
| 61 | void Merge(ITerrainChannel newTerrain, Vector3 displacement, float radianRotation, Vector2 rotationDisplacement); | ||
| 59 | } | 62 | } |
| 60 | } | 63 | } |