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/FileLoaders/JPEG.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/FileLoaders/JPEG.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs index 8667607..1a0d8ec 100644 --- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs | |||
| @@ -76,6 +76,14 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders | |||
| 76 | colours.Save(stream, ImageFormat.Jpeg); | 76 | colours.Save(stream, ImageFormat.Jpeg); |
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | public virtual void SaveFile(ITerrainChannel m_channel, string filename, | ||
| 80 | int offsetX, int offsetY, | ||
| 81 | int fileWidth, int fileHeight, | ||
| 82 | int regionSizeX, int regionSizeY) | ||
| 83 | { | ||
| 84 | throw new System.Exception("Not Implemented"); | ||
| 85 | } | ||
| 86 | |||
| 79 | #endregion | 87 | #endregion |
| 80 | 88 | ||
| 81 | public override string ToString() | 89 | public override string ToString() |