aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs30
1 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs
index 8318cdc..50fb028 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("[WEBMAP]: JPEG Map location: http://" + m_scene.RegionInfo.ExternalEndPoint.Address.ToString() + ":" + m_scene.RegionInfo.HttpPort.ToString() + "/index.php?method=" + regionimage); 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);
126 126
127 m_scene.AddHTTPHandler(regionimage, OnHTTPGetMapImage); 127 m_scene.AddHTTPHandler(regionimage, OnHTTPGetMapImage);
128 m_scene.AddLLSDHandler("/MAP/MapItems/" + m_scene.RegionInfo.RegionHandle.ToString(), HandleRemoteMapItemRequest); 128 m_scene.AddLLSDHandler("/MAP/MapItems/" + m_scene.RegionInfo.RegionHandle.ToString(), HandleRemoteMapItemRequest);
@@ -136,7 +136,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
136 136
137 public void OnRegisterCaps(UUID agentID, Caps caps) 137 public void OnRegisterCaps(UUID agentID, Caps caps)
138 { 138 {
139 m_log.DebugFormat("[VOICE] OnRegisterCaps: agentID {0} caps {1}", agentID, caps); 139 m_log.DebugFormat("[WORLD MAP]: OnRegisterCaps: agentID {0} caps {1}", agentID, caps);
140 string capsBase = "/CAPS/" + caps.CapsObjectPath; 140 string capsBase = "/CAPS/" + caps.CapsObjectPath;
141 caps.RegisterHandler("MapLayer", 141 caps.RegisterHandler("MapLayer",
142 new RestStreamHandler("POST", capsBase + m_mapLayerPath, 142 new RestStreamHandler("POST", capsBase + m_mapLayerPath,
@@ -213,7 +213,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
213 /// <returns></returns> 213 /// <returns></returns>
214 public LLSDMapLayerResponse GetMapLayer(LLSDMapRequest mapReq) 214 public LLSDMapLayerResponse GetMapLayer(LLSDMapRequest mapReq)
215 { 215 {
216 m_log.Debug("[CAPS]: MapLayer Request in region: " + m_scene.RegionInfo.RegionName); 216 m_log.Debug("[WORLD MAP]: MapLayer Request in region: " + m_scene.RegionInfo.RegionName);
217 LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse(); 217 LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse();
218 mapResponse.LayerData.Array.Add(GetOSDMapLayerResponse()); 218 mapResponse.LayerData.Array.Add(GetOSDMapLayerResponse());
219 return mapResponse; 219 return mapResponse;
@@ -285,7 +285,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
285 { 285 {
286 if (threadrunning) return; 286 if (threadrunning) return;
287 threadrunning = true; 287 threadrunning = true;
288 m_log.Warn("[WorldMap]: Starting remote MapItem request thread"); 288 m_log.Warn("[WORLD MAP]: Starting remote MapItem request thread");
289 mapItemReqThread = new Thread(new ThreadStart(process)); 289 mapItemReqThread = new Thread(new ThreadStart(process));
290 mapItemReqThread.IsBackground = true; 290 mapItemReqThread.IsBackground = true;
291 mapItemReqThread.Name = "MapItemRequestThread"; 291 mapItemReqThread.Name = "MapItemRequestThread";
@@ -371,7 +371,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
371 // be making requests 371 // be making requests
372 if (!threadrunning) 372 if (!threadrunning)
373 { 373 {
374 m_log.Warn("[WorldMap]: Starting new remote request thread manually. This means that AvatarEnteringParcel never fired! This needs to be fixed! Don't Mantis this, as the developers can see it in this message"); 374 m_log.Warn("[WORLD MAP]: Starting new remote request thread manually. This means that AvatarEnteringParcel never fired! This needs to be fixed! Don't Mantis this, as the developers can see it in this message");
375 StartThread(new object()); 375 StartThread(new object());
376 } 376 }
377 377
@@ -414,11 +414,11 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
414 } 414 }
415 catch (Exception e) 415 catch (Exception e)
416 { 416 {
417 m_log.ErrorFormat("[WorldMap]: Map item request thread terminated abnormally with exception {0}", e); 417 m_log.ErrorFormat("[WORLD MAP]: Map item request thread terminated abnormally with exception {0}", e);
418 } 418 }
419 419
420 threadrunning = false; 420 threadrunning = false;
421 m_log.Debug("[WorldMap]: Remote request thread exiting"); 421 m_log.Debug("[WORLD MAP]: Remote request thread exiting");
422 } 422 }
423 423
424 /// <summary> 424 /// <summary>
@@ -556,7 +556,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
556 if (!m_blacklistedregions.ContainsKey(regionhandle)) 556 if (!m_blacklistedregions.ContainsKey(regionhandle))
557 m_blacklistedregions.Add(regionhandle, System.Environment.TickCount); 557 m_blacklistedregions.Add(regionhandle, System.Environment.TickCount);
558 } 558 }
559 m_log.WarnFormat("[WorldMap]: Blacklisted region {0}", regionhandle.ToString()); 559 m_log.WarnFormat("[WORLD MAP]: Blacklisted region {0}", regionhandle.ToString());
560 } 560 }
561 } 561 }
562 562
@@ -601,11 +601,11 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
601 os = mapitemsrequest.GetRequestStream(); 601 os = mapitemsrequest.GetRequestStream();
602 os.Write(buffer, 0, buffer.Length); //Send it 602 os.Write(buffer, 0, buffer.Length); //Send it
603 os.Close(); 603 os.Close();
604 m_log.InfoFormat("[WorldMap]: Getting MapItems from Sim {0}", httpserver); 604 //m_log.DebugFormat("[WORLD MAP]: Getting MapItems from Sim {0}", httpserver);
605 } 605 }
606 catch (WebException ex) 606 catch (WebException ex)
607 { 607 {
608 m_log.InfoFormat("[WorldMap] Bad send on GetMapItems {0}", ex.Message); 608 m_log.InfoFormat("[WORLD MAP]: Bad send on GetMapItems {0}", ex.Message);
609 responseMap["connect"] = OSD.FromBoolean(false); 609 responseMap["connect"] = OSD.FromBoolean(false);
610 lock (m_blacklistedurls) 610 lock (m_blacklistedurls)
611 { 611 {
@@ -613,7 +613,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
613 m_blacklistedurls.Add(httpserver, System.Environment.TickCount); 613 m_blacklistedurls.Add(httpserver, System.Environment.TickCount);
614 } 614 }
615 615
616 m_log.WarnFormat("[WorldMap]: Blacklisted {0}", httpserver); 616 m_log.WarnFormat("[WORLD MAP]: Blacklisted {0}", httpserver);
617 617
618 return responseMap; 618 return responseMap;
619 } 619 }
@@ -642,7 +642,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
642 m_blacklistedurls.Add(httpserver, System.Environment.TickCount); 642 m_blacklistedurls.Add(httpserver, System.Environment.TickCount);
643 } 643 }
644 644
645 m_log.WarnFormat("[WorldMap]: Blacklisted {0}", httpserver); 645 m_log.WarnFormat("[WORLD MAP]: Blacklisted {0}", httpserver);
646 646
647 return responseMap; 647 return responseMap;
648 } 648 }
@@ -715,7 +715,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
715 715
716 public Hashtable OnHTTPGetMapImage(Hashtable keysvals) 716 public Hashtable OnHTTPGetMapImage(Hashtable keysvals)
717 { 717 {
718 m_log.Info("[WEBMAP]: Sending map image jpeg"); 718 m_log.Info("[WORLD MAP]: Sending map image jpeg");
719 Hashtable reply = new Hashtable(); 719 Hashtable reply = new Hashtable();
720 int statuscode = 200; 720 int statuscode = 200;
721 byte[] jpeg = new byte[0]; 721 byte[] jpeg = new byte[0];
@@ -756,7 +756,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
756 catch (Exception) 756 catch (Exception)
757 { 757 {
758 // Dummy! 758 // Dummy!
759 m_log.Warn("[WEBMAP]: Unable to generate Map image"); 759 m_log.Warn("[WORLD MAP]: Unable to generate Map image");
760 } 760 }
761 finally 761 finally
762 { 762 {
@@ -857,7 +857,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
857 // 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
858 // for the 1 second it costs to start a thread manually. 858 // for the 1 second it costs to start a thread manually.
859 859
860 m_log.Warn("[WORLDMAP]: MakeRootAgent Works!"); 860 m_log.Warn("[WORLD MAP]: MakeRootAgent Works!");
861 if (!threadrunning) 861 if (!threadrunning)
862 ThreadPool.QueueUserWorkItem(new WaitCallback(this.StartThread)); 862 ThreadPool.QueueUserWorkItem(new WaitCallback(this.StartThread));
863 863