diff options
author | Jeff Ames | 2008-06-13 00:21:53 +0000 |
---|---|---|
committer | Jeff Ames | 2008-06-13 00:21:53 +0000 |
commit | 64f01ade04863dbe7b392ea8f0fc4dcc8e32bd94 (patch) | |
tree | 74c4e8fdc25dc28da7c63cbc9d97141c0f344938 /OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs | |
parent | look mom, migrations in action. This adds a couple of indexes (diff) | |
download | opensim-SC_OLD-64f01ade04863dbe7b392ea8f0fc4dcc8e32bd94.zip opensim-SC_OLD-64f01ade04863dbe7b392ea8f0fc4dcc8e32bd94.tar.gz opensim-SC_OLD-64f01ade04863dbe7b392ea8f0fc4dcc8e32bd94.tar.bz2 opensim-SC_OLD-64f01ade04863dbe7b392ea8f0fc4dcc8e32bd94.tar.xz |
Update svn properties, clean up formatting, refactor out duplicate hard-coded port numbers.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs index 041af2b..ebcb440 100644 --- a/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs | |||
@@ -136,7 +136,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap | |||
136 | { | 136 | { |
137 | bool lookup = false; | 137 | bool lookup = false; |
138 | 138 | ||
139 | lock(cachedMapBlocks) | 139 | lock (cachedMapBlocks) |
140 | { | 140 | { |
141 | if (cachedMapBlocks.Count > 0 && ((cachedTime + 1800) > Util.UnixTimeSinceEpoch())) | 141 | if (cachedMapBlocks.Count > 0 && ((cachedTime + 1800) > Util.UnixTimeSinceEpoch())) |
142 | { | 142 | { |
@@ -157,7 +157,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap | |||
157 | mapBlocks = m_scene.CommsManager.GridService.RequestNeighbourMapBlocks((int)m_scene.RegionInfo.RegionLocX - 8, (int)m_scene.RegionInfo.RegionLocY - 8, (int)m_scene.RegionInfo.RegionLocX + 8, (int)m_scene.RegionInfo.RegionLocY + 8); | 157 | mapBlocks = m_scene.CommsManager.GridService.RequestNeighbourMapBlocks((int)m_scene.RegionInfo.RegionLocX - 8, (int)m_scene.RegionInfo.RegionLocY - 8, (int)m_scene.RegionInfo.RegionLocX + 8, (int)m_scene.RegionInfo.RegionLocY + 8); |
158 | avatarPresence.ControllingClient.SendMapBlock(mapBlocks); | 158 | avatarPresence.ControllingClient.SendMapBlock(mapBlocks); |
159 | 159 | ||
160 | lock(cachedMapBlocks) | 160 | lock (cachedMapBlocks) |
161 | cachedMapBlocks = mapBlocks; | 161 | cachedMapBlocks = mapBlocks; |
162 | 162 | ||
163 | cachedTime = Util.UnixTimeSinceEpoch(); | 163 | cachedTime = Util.UnixTimeSinceEpoch(); |
@@ -236,4 +236,4 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap | |||
236 | remoteClient.SendMapBlock(mapBlocks); | 236 | remoteClient.SendMapBlock(mapBlocks); |
237 | } | 237 | } |
238 | } | 238 | } |
239 | } \ No newline at end of file | 239 | } |