diff options
| author | UbitUmarov | 2012-07-08 13:09:32 +0100 |
|---|---|---|
| committer | UbitUmarov | 2012-07-08 13:09:32 +0100 |
| commit | b74d4711bbf250595d422a5eecac380317d3365d (patch) | |
| tree | 064b128509b7a91ebebbf94d094c1a25be16a9da /OpenSim/Region/CoreModules/Hypergrid | |
| parent | Merge branch 'avination' into ubitwork (diff) | |
| parent | Revamp map block sending to eliminate overload of the grid server connection (diff) | |
| download | opensim-SC-b74d4711bbf250595d422a5eecac380317d3365d.zip opensim-SC-b74d4711bbf250595d422a5eecac380317d3365d.tar.gz opensim-SC-b74d4711bbf250595d422a5eecac380317d3365d.tar.bz2 opensim-SC-b74d4711bbf250595d422a5eecac380317d3365d.tar.xz | |
Merge branch 'avination' into ubitwork
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 0c60391..4f18b53 100644 --- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs +++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs | |||
| @@ -90,9 +90,9 @@ namespace OpenSim.Region.CoreModules.Hypergrid | |||
| 90 | } | 90 | } |
| 91 | } | 91 | } |
| 92 | 92 | ||
| 93 | protected override List<MapBlockData> GetAndSendBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag) | 93 | protected override List<MapBlockData> GetAndSendBlocksInternal(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag) |
| 94 | { | 94 | { |
| 95 | List<MapBlockData> mapBlocks = base.GetAndSendBlocks(remoteClient, minX, minY, maxX, maxY, flag); | 95 | List<MapBlockData> mapBlocks = base.GetAndSendBlocksInternal(remoteClient, minX, minY, maxX, maxY, flag); |
| 96 | lock (m_SeenMapBlocks) | 96 | lock (m_SeenMapBlocks) |
| 97 | { | 97 | { |
| 98 | if (!m_SeenMapBlocks.ContainsKey(remoteClient.AgentId)) | 98 | if (!m_SeenMapBlocks.ContainsKey(remoteClient.AgentId)) |