diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 60 |
1 files changed, 28 insertions, 32 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index 376e365..b372988 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -25,33 +25,29 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Drawing; | 31 | using System.Drawing; |
32 | using System.Drawing.Imaging; | 32 | using System.Drawing.Imaging; |
33 | using System.IO; | 33 | using System.IO; |
34 | using System.Net; | 34 | using System.Net; |
35 | using System.Reflection; | 35 | using System.Reflection; |
36 | using System.Threading; | 36 | using System.Threading; |
37 | using OpenMetaverse; | 37 | using log4net; |
38 | using OpenMetaverse.Imaging; | 38 | using Nini.Config; |
39 | using OpenMetaverse.StructuredData; | 39 | using OpenMetaverse; |
40 | using log4net; | 40 | using OpenMetaverse.Imaging; |
41 | using Nini.Config; | 41 | using OpenMetaverse.StructuredData; |
42 | using OpenSim.Framework; | 42 | using OpenSim.Framework; |
43 | using OpenSim.Framework.Communications.Cache; | 43 | using OpenSim.Framework.Communications.Capabilities; |
44 | using OpenSim.Framework.Communications.Capabilities; | 44 | using OpenSim.Framework.Servers; |
45 | using OpenSim.Framework.Servers; | 45 | using OpenSim.Region.Framework.Interfaces; |
46 | using OpenSim.Region.Framework.Interfaces; | 46 | using OpenSim.Region.Framework.Scenes; |
47 | using OpenSim.Region.Framework.Scenes; | 47 | using Caps=OpenSim.Framework.Communications.Capabilities.Caps; |
48 | using OpenSim.Region.Framework.Scenes.Types; | 48 | using OSDArray=OpenMetaverse.StructuredData.OSDArray; |
49 | using Caps = OpenSim.Framework.Communications.Capabilities.Caps; | 49 | using OSDMap=OpenMetaverse.StructuredData.OSDMap; |
50 | 50 | ||
51 | using OSD = OpenMetaverse.StructuredData.OSD; | ||
52 | using OSDMap = OpenMetaverse.StructuredData.OSDMap; | ||
53 | using OSDArray = OpenMetaverse.StructuredData.OSDArray; | ||
54 | |||
55 | namespace OpenSim.Region.CoreModules.World.WorldMap | 51 | namespace OpenSim.Region.CoreModules.World.WorldMap |
56 | { | 52 | { |
57 | public class WorldMapModule : IRegionModule | 53 | public class WorldMapModule : IRegionModule |
@@ -329,7 +325,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
329 | { | 325 | { |
330 | // Local Map Item Request | 326 | // Local Map Item Request |
331 | List<ScenePresence> avatars = m_scene.GetAvatars(); | 327 | List<ScenePresence> avatars = m_scene.GetAvatars(); |
332 | int tc = System.Environment.TickCount; | 328 | int tc = Environment.TickCount; |
333 | List<mapItemReply> mapitems = new List<mapItemReply>(); | 329 | List<mapItemReply> mapitems = new List<mapItemReply>(); |
334 | mapItemReply mapitem = new mapItemReply(); | 330 | mapItemReply mapitem = new mapItemReply(); |
335 | if (avatars.Count == 0 || avatars.Count == 1) | 331 | if (avatars.Count == 0 || avatars.Count == 1) |
@@ -554,7 +550,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
554 | lock (m_blacklistedregions) | 550 | lock (m_blacklistedregions) |
555 | { | 551 | { |
556 | if (!m_blacklistedregions.ContainsKey(regionhandle)) | 552 | if (!m_blacklistedregions.ContainsKey(regionhandle)) |
557 | m_blacklistedregions.Add(regionhandle, System.Environment.TickCount); | 553 | m_blacklistedregions.Add(regionhandle, Environment.TickCount); |
558 | } | 554 | } |
559 | m_log.InfoFormat("[WORLD MAP]: Blacklisted region {0}", regionhandle.ToString()); | 555 | m_log.InfoFormat("[WORLD MAP]: Blacklisted region {0}", regionhandle.ToString()); |
560 | } | 556 | } |
@@ -610,7 +606,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
610 | lock (m_blacklistedurls) | 606 | lock (m_blacklistedurls) |
611 | { | 607 | { |
612 | if (!m_blacklistedurls.ContainsKey(httpserver)) | 608 | if (!m_blacklistedurls.ContainsKey(httpserver)) |
613 | m_blacklistedurls.Add(httpserver, System.Environment.TickCount); | 609 | m_blacklistedurls.Add(httpserver, Environment.TickCount); |
614 | } | 610 | } |
615 | 611 | ||
616 | m_log.WarnFormat("[WORLD MAP]: Blacklisted {0}", httpserver); | 612 | m_log.WarnFormat("[WORLD MAP]: Blacklisted {0}", httpserver); |
@@ -639,7 +635,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
639 | lock (m_blacklistedurls) | 635 | lock (m_blacklistedurls) |
640 | { | 636 | { |
641 | if (!m_blacklistedurls.ContainsKey(httpserver)) | 637 | if (!m_blacklistedurls.ContainsKey(httpserver)) |
642 | m_blacklistedurls.Add(httpserver, System.Environment.TickCount); | 638 | m_blacklistedurls.Add(httpserver, Environment.TickCount); |
643 | } | 639 | } |
644 | 640 | ||
645 | m_log.WarnFormat("[WORLD MAP]: Blacklisted {0}", httpserver); | 641 | m_log.WarnFormat("[WORLD MAP]: Blacklisted {0}", httpserver); |
@@ -804,7 +800,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
804 | List<ScenePresence> avatars = m_scene.GetAvatars(); | 800 | List<ScenePresence> avatars = m_scene.GetAvatars(); |
805 | OSDArray responsearr = new OSDArray(avatars.Count); | 801 | OSDArray responsearr = new OSDArray(avatars.Count); |
806 | OSDMap responsemapdata = new OSDMap(); | 802 | OSDMap responsemapdata = new OSDMap(); |
807 | int tc = System.Environment.TickCount; | 803 | int tc = Environment.TickCount; |
808 | /* | 804 | /* |
809 | foreach (ScenePresence av in avatars) | 805 | foreach (ScenePresence av in avatars) |
810 | { | 806 | { |