diff options
| author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
| commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
| tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Region/CoreModules/Hypergrid | |
| parent | remove lixo (diff) | |
| parent | dont change camera on crossings (diff) | |
| download | opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz | |
bad merge?
Diffstat (limited to 'OpenSim/Region/CoreModules/Hypergrid')
| -rw-r--r-- | OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs index ea5b34e..a5c7543 100644 --- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs +++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs | |||
| @@ -138,9 +138,9 @@ namespace OpenSim.Region.CoreModules.Hypergrid | |||
| 138 | } | 138 | } |
| 139 | } | 139 | } |
| 140 | 140 | ||
| 141 | protected override List<MapBlockData> GetAndSendBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag) | 141 | protected override List<MapBlockData> GetAndSendBlocksInternal(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag) |
| 142 | { | 142 | { |
| 143 | List<MapBlockData> mapBlocks = base.GetAndSendBlocks(remoteClient, minX, minY, maxX, maxY, flag); | 143 | List<MapBlockData> mapBlocks = base.GetAndSendBlocksInternal(remoteClient, minX, minY, maxX, maxY, flag); |
| 144 | lock (m_SeenMapBlocks) | 144 | lock (m_SeenMapBlocks) |
| 145 | { | 145 | { |
| 146 | if (!m_SeenMapBlocks.ContainsKey(remoteClient.AgentId)) | 146 | if (!m_SeenMapBlocks.ContainsKey(remoteClient.AgentId)) |