diff options
| author | Justin Clark-Casey (justincc) | 2014-03-18 20:09:15 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-03-18 20:09:15 +0000 |
| commit | d5f5649750c9f22d2d160d581fa35f422a9ad760 (patch) | |
| tree | 2ee197c5d60894663388047839ee9fa0e143d6d9 /OpenSim/Services/Interfaces | |
| parent | Lock m_syncRoot on DoubleQueue.Count. This is not documented as a thread-saf... (diff) | |
| parent | Add delete maptile ability to MapImageService - yet untested (diff) | |
| download | opensim-SC-d5f5649750c9f22d2d160d581fa35f422a9ad760.zip opensim-SC-d5f5649750c9f22d2d160d581fa35f422a9ad760.tar.gz opensim-SC-d5f5649750c9f22d2d160d581fa35f422a9ad760.tar.bz2 opensim-SC-d5f5649750c9f22d2d160d581fa35f422a9ad760.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services/Interfaces')
| -rw-r--r-- | OpenSim/Services/Interfaces/IMapImageService.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Services/Interfaces/IMapImageService.cs b/OpenSim/Services/Interfaces/IMapImageService.cs index a7b2cf1..78daa5f 100644 --- a/OpenSim/Services/Interfaces/IMapImageService.cs +++ b/OpenSim/Services/Interfaces/IMapImageService.cs | |||
| @@ -35,6 +35,7 @@ namespace OpenSim.Services.Interfaces | |||
| 35 | { | 35 | { |
| 36 | //List<MapBlockData> GetMapBlocks(UUID scopeID, int minX, int minY, int maxX, int maxY); | 36 | //List<MapBlockData> GetMapBlocks(UUID scopeID, int minX, int minY, int maxX, int maxY); |
| 37 | bool AddMapTile(int x, int y, byte[] imageData, out string reason); | 37 | bool AddMapTile(int x, int y, byte[] imageData, out string reason); |
| 38 | bool RemoveMapTile(int x, int y, out string reason); | ||
| 38 | byte[] GetMapTile(string fileName, out string format); | 39 | byte[] GetMapTile(string fileName, out string format); |
| 39 | } | 40 | } |
| 40 | } | 41 | } |