diff options
author | Melanie Thielker | 2014-08-23 17:27:01 +0200 |
---|---|---|
committer | Melanie Thielker | 2014-08-23 17:27:01 +0200 |
commit | cbd7c7b9ecbe7bbe19d5c675322206bc8a977c5f (patch) | |
tree | 16b07a06b057f3ee29a4581e1810dbc5b34ad7cb /OpenSim/Services/Connectors/MapImage | |
parent | Merge branch 'ubitworkmaster' (diff) | |
download | opensim-SC-cbd7c7b9ecbe7bbe19d5c675322206bc8a977c5f.zip opensim-SC-cbd7c7b9ecbe7bbe19d5c675322206bc8a977c5f.tar.gz opensim-SC-cbd7c7b9ecbe7bbe19d5c675322206bc8a977c5f.tar.bz2 opensim-SC-cbd7c7b9ecbe7bbe19d5c675322206bc8a977c5f.tar.xz |
Change the map tile system to be multi-grid hosting compatible
Diffstat (limited to 'OpenSim/Services/Connectors/MapImage')
-rw-r--r-- | OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs b/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs index 725204d..ba4c3c5 100644 --- a/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs +++ b/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs | |||
@@ -86,13 +86,14 @@ namespace OpenSim.Services.Connectors | |||
86 | m_ServerURI = serviceURI.TrimEnd('/'); | 86 | m_ServerURI = serviceURI.TrimEnd('/'); |
87 | } | 87 | } |
88 | 88 | ||
89 | public bool RemoveMapTile(int x, int y, out string reason) | 89 | public bool RemoveMapTile(int x, int y, UUID scopeID, out string reason) |
90 | { | 90 | { |
91 | reason = string.Empty; | 91 | reason = string.Empty; |
92 | int tickstart = Util.EnvironmentTickCount(); | 92 | int tickstart = Util.EnvironmentTickCount(); |
93 | Dictionary<string, object> sendData = new Dictionary<string, object>(); | 93 | Dictionary<string, object> sendData = new Dictionary<string, object>(); |
94 | sendData["X"] = x.ToString(); | 94 | sendData["X"] = x.ToString(); |
95 | sendData["Y"] = y.ToString(); | 95 | sendData["Y"] = y.ToString(); |
96 | sendData["SCOPE"] = scopeID.ToString(); | ||
96 | 97 | ||
97 | string reqString = ServerUtils.BuildQueryString(sendData); | 98 | string reqString = ServerUtils.BuildQueryString(sendData); |
98 | string uri = m_ServerURI + "/removemap"; | 99 | string uri = m_ServerURI + "/removemap"; |
@@ -146,13 +147,14 @@ namespace OpenSim.Services.Connectors | |||
146 | return false; | 147 | return false; |
147 | } | 148 | } |
148 | 149 | ||
149 | public bool AddMapTile(int x, int y, byte[] jpgData, out string reason) | 150 | public bool AddMapTile(int x, int y, byte[] jpgData, UUID scopeID, out string reason) |
150 | { | 151 | { |
151 | reason = string.Empty; | 152 | reason = string.Empty; |
152 | int tickstart = Util.EnvironmentTickCount(); | 153 | int tickstart = Util.EnvironmentTickCount(); |
153 | Dictionary<string, object> sendData = new Dictionary<string, object>(); | 154 | Dictionary<string, object> sendData = new Dictionary<string, object>(); |
154 | sendData["X"] = x.ToString(); | 155 | sendData["X"] = x.ToString(); |
155 | sendData["Y"] = y.ToString(); | 156 | sendData["Y"] = y.ToString(); |
157 | sendData["SCOPE"] = scopeID.ToString(); | ||
156 | sendData["TYPE"] = "image/jpeg"; | 158 | sendData["TYPE"] = "image/jpeg"; |
157 | sendData["DATA"] = Convert.ToBase64String(jpgData); | 159 | sendData["DATA"] = Convert.ToBase64String(jpgData); |
158 | 160 | ||
@@ -212,7 +214,7 @@ namespace OpenSim.Services.Connectors | |||
212 | 214 | ||
213 | } | 215 | } |
214 | 216 | ||
215 | public byte[] GetMapTile(string fileName, out string format) | 217 | public byte[] GetMapTile(string fileName, UUID scopeID, out string format) |
216 | { | 218 | { |
217 | format = string.Empty; | 219 | format = string.Empty; |
218 | new Exception("GetMapTile method not Implemented"); | 220 | new Exception("GetMapTile method not Implemented"); |