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/Region/CoreModules/ServiceConnectorsOut | |
| 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/Region/CoreModules/ServiceConnectorsOut')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs index b61062f..40bedc1 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs | |||
| @@ -227,7 +227,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage | |||
| 227 | } | 227 | } |
| 228 | 228 | ||
| 229 | string reason = string.Empty; | 229 | string reason = string.Empty; |
| 230 | if (!m_MapService.AddMapTile((int)scene.RegionInfo.RegionLocX, (int)scene.RegionInfo.RegionLocY, jpgData, out reason)) | 230 | if (!m_MapService.AddMapTile((int)scene.RegionInfo.RegionLocX, (int)scene.RegionInfo.RegionLocY, jpgData, scene.RegionInfo.ScopeID, out reason)) |
| 231 | { | 231 | { |
| 232 | m_log.DebugFormat("[MAP IMAGE SERVICE MODULE]: Unable to upload tile image for {0} at {1}-{2}: {3}", | 232 | m_log.DebugFormat("[MAP IMAGE SERVICE MODULE]: Unable to upload tile image for {0} at {1}-{2}: {3}", |
| 233 | scene.RegionInfo.RegionName, scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY, reason); | 233 | scene.RegionInfo.RegionName, scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY, reason); |