diff options
| author | Mic Bowman | 2011-04-13 15:41:17 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-04-13 15:41:17 -0700 |
| commit | 590d20903c6dd596cb8ae3337065f955bd207b67 (patch) | |
| tree | f6b60205fd58b03f03c9110a68b2036a3ef075d2 /OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs | |
| parent | Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into queu... (diff) | |
| parent | remove packet monitoring debugging code (diff) | |
| download | opensim-SC_OLD-590d20903c6dd596cb8ae3337065f955bd207b67.zip opensim-SC_OLD-590d20903c6dd596cb8ae3337065f955bd207b67.tar.gz opensim-SC_OLD-590d20903c6dd596cb8ae3337065f955bd207b67.tar.bz2 opensim-SC_OLD-590d20903c6dd596cb8ae3337065f955bd207b67.tar.xz | |
Merge branch 'testmerge' into queuetest
Conflicts:
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs index 7403281..7237f90 100644 --- a/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs | |||
| @@ -38,5 +38,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain | |||
| 38 | ITerrainChannel LoadStream(Stream stream); | 38 | ITerrainChannel LoadStream(Stream stream); |
| 39 | void SaveFile(string filename, ITerrainChannel map); | 39 | void SaveFile(string filename, ITerrainChannel map); |
| 40 | void SaveStream(Stream stream, ITerrainChannel map); | 40 | void SaveStream(Stream stream, ITerrainChannel map); |
| 41 | void SaveFile(ITerrainChannel map, string filename, int offsetX, int offsetY, int fileWidth, int fileHeight, int regionSizeX, int regionSizeY); | ||
| 41 | } | 42 | } |
| 42 | } \ No newline at end of file | 43 | } \ No newline at end of file |