diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index c249e9d..5dcf326 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -68,7 +68,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
68 | private static readonly UUID STOP_UUID = UUID.Random(); | 68 | private static readonly UUID STOP_UUID = UUID.Random(); |
69 | 69 | ||
70 | private OpenSim.Framework.BlockingQueue<MapRequestState> requests = new OpenSim.Framework.BlockingQueue<MapRequestState>(); | 70 | private OpenSim.Framework.BlockingQueue<MapRequestState> requests = new OpenSim.Framework.BlockingQueue<MapRequestState>(); |
71 | 71 | ||
72 | private ManualResetEvent m_mapBlockRequestEvent = new ManualResetEvent(false); | 72 | private ManualResetEvent m_mapBlockRequestEvent = new ManualResetEvent(false); |
73 | private Dictionary<UUID, Queue<MapBlockRequestData>> m_mapBlockRequests = new Dictionary<UUID, Queue<MapBlockRequestData>>(); | 73 | private Dictionary<UUID, Queue<MapBlockRequestData>> m_mapBlockRequests = new Dictionary<UUID, Queue<MapBlockRequestData>>(); |
74 | 74 | ||
@@ -729,7 +729,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
729 | break; | 729 | break; |
730 | 730 | ||
731 | // agent gone? | 731 | // agent gone? |
732 | 732 | ||
733 | m_scene.TryGetScenePresence(st.agentID, out av); | 733 | m_scene.TryGetScenePresence(st.agentID, out av); |
734 | if (av == null || av.IsChildAgent || av.IsDeleted || av.IsInTransit) | 734 | if (av == null || av.IsChildAgent || av.IsDeleted || av.IsInTransit) |
735 | continue; | 735 | continue; |
@@ -748,7 +748,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
748 | { | 748 | { |
749 | m_cachedRegionMapItemsResponses.TryGetValue(st.regionhandle, out responseMap); | 749 | m_cachedRegionMapItemsResponses.TryGetValue(st.regionhandle, out responseMap); |
750 | dorequest = false; | 750 | dorequest = false; |
751 | } | 751 | } |
752 | else | 752 | else |
753 | m_cachedRegionMapItemsResponses.Add(st.regionhandle, null, expireResponsesTime); // a bit more time for the access | 753 | m_cachedRegionMapItemsResponses.Add(st.regionhandle, null, expireResponsesTime); // a bit more time for the access |
754 | } | 754 | } |
@@ -1133,7 +1133,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1133 | if(m_mapBlockRequests[agentID].Count < 150 ) | 1133 | if(m_mapBlockRequests[agentID].Count < 150 ) |
1134 | m_mapBlockRequests[agentID].Enqueue(req); | 1134 | m_mapBlockRequests[agentID].Enqueue(req); |
1135 | else | 1135 | else |
1136 | { | 1136 | { |
1137 | spamBlocked[agentID] = now + SPAMBLOCKTIMEms; | 1137 | spamBlocked[agentID] = now + SPAMBLOCKTIMEms; |
1138 | m_log.DebugFormat("[WoldMapModule] RequestMapBlocks blocking spammer {0} for {1} s",agentID, SPAMBLOCKTIMEms/1000.0); | 1138 | m_log.DebugFormat("[WoldMapModule] RequestMapBlocks blocking spammer {0} for {1} s",agentID, SPAMBLOCKTIMEms/1000.0); |
1139 | } | 1139 | } |
@@ -1193,7 +1193,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1193 | maxY * (int)Constants.RegionSize); | 1193 | maxY * (int)Constants.RegionSize); |
1194 | 1194 | ||
1195 | // only send a negative answer for a single region request | 1195 | // only send a negative answer for a single region request |
1196 | // corresponding to a click on the map. Current viewers | 1196 | // corresponding to a click on the map. Current viewers |
1197 | // keep displaying "loading.." without this | 1197 | // keep displaying "loading.." without this |
1198 | if (regions.Count == 0 && (flag & 0x10000) != 0 && minX == maxX && minY == maxY) | 1198 | if (regions.Count == 0 && (flag & 0x10000) != 0 && minX == maxX && minY == maxY) |
1199 | { | 1199 | { |
@@ -1539,7 +1539,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1539 | responsemap["10"] = responsearr; | 1539 | responsemap["10"] = responsearr; |
1540 | else | 1540 | else |
1541 | responsemap["7"] = responsearr; | 1541 | responsemap["7"] = responsearr; |
1542 | } | 1542 | } |
1543 | } | 1543 | } |
1544 | 1544 | ||
1545 | if (m_scene.RegionInfo.RegionSettings.TelehubObject != UUID.Zero) | 1545 | if (m_scene.RegionInfo.RegionSettings.TelehubObject != UUID.Zero) |