diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/WorldMap')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs index 6ce82ad..cf1900b 100644 --- a/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs | |||
@@ -122,7 +122,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap | |||
122 | 122 | ||
123 | string regionimage = "regionImage" + m_scene.RegionInfo.RegionID.ToString(); | 123 | string regionimage = "regionImage" + m_scene.RegionInfo.RegionID.ToString(); |
124 | regionimage = regionimage.Replace("-", ""); | 124 | regionimage = regionimage.Replace("-", ""); |
125 | m_log.Warn("[WORLD MAP]: JPEG Map location: http://" + m_scene.RegionInfo.ExternalEndPoint.Address.ToString() + ":" + m_scene.RegionInfo.HttpPort.ToString() + "/index.php?method=" + regionimage); | 125 | m_log.Info("[WORLD MAP]: JPEG Map location: http://" + m_scene.RegionInfo.ExternalEndPoint.Address.ToString() + ":" + m_scene.RegionInfo.HttpPort.ToString() + "/index.php?method=" + regionimage); |
126 | 126 | ||
127 | m_scene.CommsManager.HttpServer.AddHTTPHandler(regionimage, OnHTTPGetMapImage); | 127 | m_scene.CommsManager.HttpServer.AddHTTPHandler(regionimage, OnHTTPGetMapImage); |
128 | m_scene.CommsManager.HttpServer.AddLLSDHandler( | 128 | m_scene.CommsManager.HttpServer.AddLLSDHandler( |
@@ -137,7 +137,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap | |||
137 | 137 | ||
138 | public void OnRegisterCaps(UUID agentID, Caps caps) | 138 | public void OnRegisterCaps(UUID agentID, Caps caps) |
139 | { | 139 | { |
140 | m_log.DebugFormat("[WORLD MAP]: OnRegisterCaps: agentID {0} caps {1}", agentID, caps); | 140 | //m_log.DebugFormat("[WORLD MAP]: OnRegisterCaps: agentID {0} caps {1}", agentID, caps); |
141 | string capsBase = "/CAPS/" + caps.CapsObjectPath; | 141 | string capsBase = "/CAPS/" + caps.CapsObjectPath; |
142 | caps.RegisterHandler("MapLayer", | 142 | caps.RegisterHandler("MapLayer", |
143 | new RestStreamHandler("POST", capsBase + m_mapLayerPath, | 143 | new RestStreamHandler("POST", capsBase + m_mapLayerPath, |
@@ -286,7 +286,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap | |||
286 | { | 286 | { |
287 | if (threadrunning) return; | 287 | if (threadrunning) return; |
288 | threadrunning = true; | 288 | threadrunning = true; |
289 | m_log.Warn("[WORLD MAP]: Starting remote MapItem request thread"); | 289 | m_log.Debug("[WORLD MAP]: Starting remote MapItem request thread"); |
290 | mapItemReqThread = new Thread(new ThreadStart(process)); | 290 | mapItemReqThread = new Thread(new ThreadStart(process)); |
291 | mapItemReqThread.IsBackground = true; | 291 | mapItemReqThread.IsBackground = true; |
292 | mapItemReqThread.Name = "MapItemRequestThread"; | 292 | mapItemReqThread.Name = "MapItemRequestThread"; |
@@ -419,7 +419,6 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap | |||
419 | } | 419 | } |
420 | 420 | ||
421 | threadrunning = false; | 421 | threadrunning = false; |
422 | m_log.Debug("[WORLD MAP]: Remote request thread exiting"); | ||
423 | } | 422 | } |
424 | 423 | ||
425 | /// <summary> | 424 | /// <summary> |
@@ -557,7 +556,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap | |||
557 | if (!m_blacklistedregions.ContainsKey(regionhandle)) | 556 | if (!m_blacklistedregions.ContainsKey(regionhandle)) |
558 | m_blacklistedregions.Add(regionhandle, System.Environment.TickCount); | 557 | m_blacklistedregions.Add(regionhandle, System.Environment.TickCount); |
559 | } | 558 | } |
560 | m_log.WarnFormat("[WORLD MAP]: Blacklisted region {0}", regionhandle.ToString()); | 559 | m_log.InfoFormat("[WORLD MAP]: Blacklisted region {0}", regionhandle.ToString()); |
561 | } | 560 | } |
562 | } | 561 | } |
563 | 562 | ||
@@ -606,7 +605,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap | |||
606 | } | 605 | } |
607 | catch (WebException ex) | 606 | catch (WebException ex) |
608 | { | 607 | { |
609 | m_log.InfoFormat("[WORLD MAP]: Bad send on GetMapItems {0}", ex.Message); | 608 | m_log.WarnFormat("[WORLD MAP]: Bad send on GetMapItems {0}", ex.Message); |
610 | responseMap["connect"] = OSD.FromBoolean(false); | 609 | responseMap["connect"] = OSD.FromBoolean(false); |
611 | lock (m_blacklistedurls) | 610 | lock (m_blacklistedurls) |
612 | { | 611 | { |
@@ -716,7 +715,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap | |||
716 | 715 | ||
717 | public Hashtable OnHTTPGetMapImage(Hashtable keysvals) | 716 | public Hashtable OnHTTPGetMapImage(Hashtable keysvals) |
718 | { | 717 | { |
719 | m_log.Info("[WORLD MAP]: Sending map image jpeg"); | 718 | m_log.Debug("[WORLD MAP]: Sending map image jpeg"); |
720 | Hashtable reply = new Hashtable(); | 719 | Hashtable reply = new Hashtable(); |
721 | int statuscode = 200; | 720 | int statuscode = 200; |
722 | byte[] jpeg = new byte[0]; | 721 | byte[] jpeg = new byte[0]; |
@@ -857,8 +856,6 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap | |||
857 | // You may ask, why this is in a threadpool to start with.. | 856 | // You may ask, why this is in a threadpool to start with.. |
858 | // The reason is so we don't cause the thread to freeze waiting | 857 | // The reason is so we don't cause the thread to freeze waiting |
859 | // for the 1 second it costs to start a thread manually. | 858 | // for the 1 second it costs to start a thread manually. |
860 | |||
861 | m_log.Warn("[WORLD MAP]: MakeRootAgent Works!"); | ||
862 | if (!threadrunning) | 859 | if (!threadrunning) |
863 | ThreadPool.QueueUserWorkItem(new WaitCallback(this.StartThread)); | 860 | ThreadPool.QueueUserWorkItem(new WaitCallback(this.StartThread)); |
864 | 861 | ||