diff options
| author | UbitUmarov | 2015-08-19 08:48:50 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-08-19 08:48:50 +0100 |
| commit | 0b105da626ae8c2fb519a817b827f90534ed7d08 (patch) | |
| tree | 509e6d091fb12f38fd09528335e51aeedbe59c08 /OpenSim/Server | |
| parent | Merge branch 'master' into ubitworkmaster (diff) | |
| parent | varregion: update MapImageServiceModule to upload multiple map tiles for larg... (diff) | |
| download | opensim-SC-0b105da626ae8c2fb519a817b827f90534ed7d08.zip opensim-SC-0b105da626ae8c2fb519a817b827f90534ed7d08.tar.gz opensim-SC-0b105da626ae8c2fb519a817b827f90534ed7d08.tar.bz2 opensim-SC-0b105da626ae8c2fb519a817b827f90534ed7d08.tar.xz | |
Merge branch 'mbworkvar2' into ubitvar
Diffstat (limited to 'OpenSim/Server')
| -rw-r--r-- | OpenSim/Server/Handlers/Map/MapAddServerConnector.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs index 7ee347c..d2fbfa6 100644 --- a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs +++ b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs | |||
| @@ -133,7 +133,7 @@ namespace OpenSim.Server.Handlers.MapImage | |||
| 133 | if (m_GridService != null) | 133 | if (m_GridService != null) |
| 134 | { | 134 | { |
| 135 | System.Net.IPAddress ipAddr = GetCallerIP(httpRequest); | 135 | System.Net.IPAddress ipAddr = GetCallerIP(httpRequest); |
| 136 | GridRegion r = m_GridService.GetRegionByPosition(UUID.Zero, x * (int)Constants.RegionSize, y * (int)Constants.RegionSize); | 136 | GridRegion r = m_GridService.GetRegionByPosition(UUID.Zero, (int)Util.RegionToWorldLoc((uint)x), (int)Util.RegionToWorldLoc((uint)y)); |
| 137 | if (r != null) | 137 | if (r != null) |
| 138 | { | 138 | { |
| 139 | if (r.ExternalEndPoint.Address.ToString() != ipAddr.ToString()) | 139 | if (r.ExternalEndPoint.Address.ToString() != ipAddr.ToString()) |
diff --git a/OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs b/OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs index 8a31579..88d774a 100644 --- a/OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs +++ b/OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs | |||
| @@ -128,7 +128,7 @@ namespace OpenSim.Server.Handlers.MapImage | |||
| 128 | if (m_GridService != null) | 128 | if (m_GridService != null) |
| 129 | { | 129 | { |
| 130 | System.Net.IPAddress ipAddr = GetCallerIP(httpRequest); | 130 | System.Net.IPAddress ipAddr = GetCallerIP(httpRequest); |
| 131 | GridRegion r = m_GridService.GetRegionByPosition(UUID.Zero, x * (int)Constants.RegionSize, y * (int)Constants.RegionSize); | 131 | GridRegion r = m_GridService.GetRegionByPosition(UUID.Zero, (int)Util.RegionToWorldLoc((uint)x), (int)Util.RegionToWorldLoc((uint)y)); |
| 132 | if (r != null) | 132 | if (r != null) |
| 133 | { | 133 | { |
| 134 | if (r.ExternalEndPoint.Address.ToString() != ipAddr.ToString()) | 134 | if (r.ExternalEndPoint.Address.ToString() != ipAddr.ToString()) |