diff options
author | Melanie Thielker | 2014-08-23 17:33:14 +0200 |
---|---|---|
committer | Melanie Thielker | 2014-08-23 17:33:14 +0200 |
commit | 1a7efc2c64ac70b4ea77a370964c7a3df2c283e2 (patch) | |
tree | e45e0c0f579743ceaa83b92b7b0347d606c11e84 /OpenSim/Services/Interfaces | |
parent | Fix a condition check (diff) | |
download | opensim-SC_OLD-1a7efc2c64ac70b4ea77a370964c7a3df2c283e2.zip opensim-SC_OLD-1a7efc2c64ac70b4ea77a370964c7a3df2c283e2.tar.gz opensim-SC_OLD-1a7efc2c64ac70b4ea77a370964c7a3df2c283e2.tar.bz2 opensim-SC_OLD-1a7efc2c64ac70b4ea77a370964c7a3df2c283e2.tar.xz |
Change the map tile system to be multi-grid hosting compatible
Conflicts:
OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs
Diffstat (limited to 'OpenSim/Services/Interfaces')
-rw-r--r-- | OpenSim/Services/Interfaces/IMapImageService.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Services/Interfaces/IMapImageService.cs b/OpenSim/Services/Interfaces/IMapImageService.cs index 78daa5f..b8d45dd 100644 --- a/OpenSim/Services/Interfaces/IMapImageService.cs +++ b/OpenSim/Services/Interfaces/IMapImageService.cs | |||
@@ -34,8 +34,8 @@ namespace OpenSim.Services.Interfaces | |||
34 | public interface IMapImageService | 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); | 37 | bool AddMapTile(int x, int y, byte[] imageData, UUID scopeID, out string reason); |
38 | bool RemoveMapTile(int x, int y, out string reason); | 38 | bool RemoveMapTile(int x, int y, UUID scopeID, out string reason); |
39 | byte[] GetMapTile(string fileName, out string format); | 39 | byte[] GetMapTile(string fileName, UUID scopeID, out string format); |
40 | } | 40 | } |
41 | } | 41 | } |