aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Interfaces
diff options
context:
space:
mode:
authorMelanie2011-06-13 12:38:17 +0100
committerMelanie2011-06-13 12:38:17 +0100
commit9b1d3f0c38a79b96ab3bac72c04cfc397b0a499f (patch)
tree737d2847e8ea312e18ab96df2e2f6728e068381c /OpenSim/Services/Interfaces
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentmatch water color for warp3d map tiler and adjust lighting (diff)
downloadopensim-SC_OLD-9b1d3f0c38a79b96ab3bac72c04cfc397b0a499f.zip
opensim-SC_OLD-9b1d3f0c38a79b96ab3bac72c04cfc397b0a499f.tar.gz
opensim-SC_OLD-9b1d3f0c38a79b96ab3bac72c04cfc397b0a499f.tar.bz2
opensim-SC_OLD-9b1d3f0c38a79b96ab3bac72c04cfc397b0a499f.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/Interfaces')
-rw-r--r--OpenSim/Services/Interfaces/IMapImageService.cs (renamed from OpenSim/Services/Interfaces/IMapService.cs)6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Services/Interfaces/IMapService.cs b/OpenSim/Services/Interfaces/IMapImageService.cs
index c70f484..a7b2cf1 100644
--- a/OpenSim/Services/Interfaces/IMapService.cs
+++ b/OpenSim/Services/Interfaces/IMapImageService.cs
@@ -31,8 +31,10 @@ using OpenMetaverse;
31 31
32namespace OpenSim.Services.Interfaces 32namespace OpenSim.Services.Interfaces
33{ 33{
34 public interface IMapService 34 public interface IMapImageService
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);
38 byte[] GetMapTile(string fileName, out string format);
37 } 39 }
38} 40}