3 files changed, 21 insertions, 60 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs
index 3f82190..88eabe1 100644
--- a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs
@@ -144,22 +144,20 @@ namespace OpenSim.Region.Environment.Modules
             //m_log.Debug("[OFFSET]: " + hour + " - " + LindenHour + " - " + offsethours.ToString());
 
             LindenHourOffset = (long)((float)offsethours * (36000000000/m_day_length));
-            m_log.Info("[SUN]: Directive from the Estate Tools to set the sun phase to LindenHour " + GetLindenEstateHourFromCurrentTime().ToString());
+            m_log.Debug("[SUN]: Directive from the Estate Tools to set the sun phase to LindenHour " + GetLindenEstateHourFromCurrentTime().ToString());
         }
 
         // Called immediately after the module is loaded for a given region
         // i.e. Immediately after instance creation.
         public void Initialise(Scene scene, IConfigSource config)
         {
-            m_log.Debug("[SUN] Initializing");
-
             m_scene = scene;
 
             m_frame = 0;
 
             TimeZone local = TimeZone.CurrentTimeZone;
             TicksOffset = local.GetUtcOffset(local.ToLocalTime(DateTime.Now)).Ticks;
-            m_log.Debug("[SUN] localtime offset is " + TicksOffset);
+            m_log.Debug("[SUN]: localtime offset is " + TicksOffset);
 
             // Align ticks with Second Life
 
@@ -185,7 +183,7 @@ namespace OpenSim.Region.Environment.Modules
             }
             catch (Exception e)
             {
-                m_log.Debug("[SUN] Configuration access failed, using defaults. Reason: "+e.Message);
+                m_log.Debug("[SUN]: Configuration access failed, using defaults. Reason: "+e.Message);
                 m_mode        = d_mode;
                 m_year_length = d_year_length;
                 m_day_length  = d_day_length;
@@ -231,10 +229,10 @@ namespace OpenSim.Region.Environment.Modules
 
                     ready = true;
 
-                    m_log.Debug("[SUN] Mode is "+m_mode);
-                    m_log.Debug("[SUN] Initialization completed. Day is "+SecondsPerSunCycle+" seconds, and year is "+m_year_length+" days");
-                    m_log.Debug("[SUN] Axis offset is "+m_day_night);
-                    m_log.Debug("[SUN] Positional data updated every "+m_frame_mod+" frames");
+                    m_log.Debug("[SUN]: Mode is "+m_mode);
+                    m_log.Debug("[SUN]: Initialization completed. Day is "+SecondsPerSunCycle+" seconds, and year is "+m_year_length+" days");
+                    m_log.Debug("[SUN]: Axis offset is "+m_day_night);
+                    m_log.Debug("[SUN]: Positional data updated every "+m_frame_mod+" frames");
 
                     break;
             }
@@ -276,7 +274,6 @@ namespace OpenSim.Region.Environment.Modules
                     if (!sunFixed)
                         GenSunPos();    // Generate shared values once
                     client.SendSunPos(Position, Velocity, CurrentTime, SecondsPerSunCycle, SecondsPerYear, OrbitalPosition);
-                    m_log.Debug("[SUN] Initial update for new client");
                 }
             }
         }
@@ -383,7 +380,6 @@ namespace OpenSim.Region.Environment.Modules
                 if (m_rootAgents.ContainsKey(AgentId))
                 {
                     m_rootAgents.Remove(AgentId);
-                    m_log.Info("[SUN]: Removing " + AgentId + ". Agent logged out.");
                 }
             }
         }
diff --git a/OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs b/OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs
index 52eb6e7..6b06fbd 100644
--- a/OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs
@@ -37,7 +37,6 @@ namespace OpenSim.Region.Environment.Modules
 {
     public class WindModule : IWindModule
     {
-
         private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 
         private int m_frame = 0;
@@ -46,40 +45,14 @@ namespace OpenSim.Region.Environment.Modules
         private Scene m_scene = null;
         private bool ready = false;
         private Vector2[] windSpeeds = new Vector2[16 * 16];
-
         private Dictionary<UUID, ulong> m_rootAgents = new Dictionary<UUID, ulong>();
-
-        // Current time in elpased seconds since Jan 1st 1970
-  
-      
+     
         public void Initialise(Scene scene, IConfigSource config)
         {
-            m_log.Debug("[WIND] Initializing");
-
             m_scene = scene;
-
             m_frame = 0;
 
-
-
-            // Align ticks with Second Life
-
-
-
-            // Just in case they don't have the stanzas
-            try
-            {
-                
-            }
-            catch (Exception e)
-            {
-                m_log.Debug("[WIND] Configuration access failed, using defaults. Reason: " + e.Message);
-                
-            }
-
-            
-            scene.EventManager.OnFrame += WindUpdate;
-            
+            scene.EventManager.OnFrame += WindUpdate;            
             scene.EventManager.OnMakeChildAgent += MakeChildAgent;
             scene.EventManager.OnAvatarEnteringNewParcel += AvatarEnteringParcel;
             scene.EventManager.OnClientClosed += ClientLoggedOut;
@@ -88,9 +61,6 @@ namespace OpenSim.Region.Environment.Modules
             GenWindPos();
 
             ready = true;
-
-
-            
         }
 
         public void PostInitialise()
@@ -125,13 +95,12 @@ namespace OpenSim.Region.Environment.Modules
 
         public void WindToClient(IClientAPI client)
         {
-                if (ready)
-                {
-                    //if (!sunFixed)
-                        //GenWindPos();    // Generate shared values once
-                    client.SendWindData(windSpeeds);
-                    m_log.Debug("[WIND] Initial update for new client");
-                }
+            if (ready)
+            {
+                //if (!sunFixed)
+                    //GenWindPos();    // Generate shared values once
+                client.SendWindData(windSpeeds);
+            }
         }
 
         public void WindUpdate()
@@ -199,7 +168,6 @@ namespace OpenSim.Region.Environment.Modules
                 if (m_rootAgents.ContainsKey(AgentId))
                 {
                     m_rootAgents.Remove(AgentId);
-                    m_log.Info("[WIND]: Removing " + AgentId + ". Agent logged out.");
                 }
             }
         }
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
 
             string regionimage = "regionImage" + m_scene.RegionInfo.RegionID.ToString();
             regionimage = regionimage.Replace("-", "");
-            m_log.Warn("[WORLD MAP]: JPEG Map location: http://" + m_scene.RegionInfo.ExternalEndPoint.Address.ToString() + ":" + m_scene.RegionInfo.HttpPort.ToString() + "/index.php?method=" + regionimage);
+            m_log.Info("[WORLD MAP]: JPEG Map location: http://" + m_scene.RegionInfo.ExternalEndPoint.Address.ToString() + ":" + m_scene.RegionInfo.HttpPort.ToString() + "/index.php?method=" + regionimage);
 
             m_scene.CommsManager.HttpServer.AddHTTPHandler(regionimage, OnHTTPGetMapImage);
             m_scene.CommsManager.HttpServer.AddLLSDHandler(
@@ -137,7 +137,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
 
         public void OnRegisterCaps(UUID agentID, Caps caps)
         {
-            m_log.DebugFormat("[WORLD MAP]: OnRegisterCaps: agentID {0} caps {1}", agentID, caps);
+            //m_log.DebugFormat("[WORLD MAP]: OnRegisterCaps: agentID {0} caps {1}", agentID, caps);
             string capsBase = "/CAPS/" + caps.CapsObjectPath;
             caps.RegisterHandler("MapLayer",
                                  new RestStreamHandler("POST", capsBase + m_mapLayerPath,
@@ -286,7 +286,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
         {
             if (threadrunning) return;
             threadrunning = true;
-            m_log.Warn("[WORLD MAP]: Starting remote MapItem request thread");
+            m_log.Debug("[WORLD MAP]: Starting remote MapItem request thread");
             mapItemReqThread = new Thread(new ThreadStart(process));
             mapItemReqThread.IsBackground = true;
             mapItemReqThread.Name = "MapItemRequestThread";
@@ -419,7 +419,6 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
             }
             
             threadrunning = false;
-            m_log.Debug("[WORLD MAP]: Remote request thread exiting");
         }
 
         /// <summary>
@@ -557,7 +556,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
                         if (!m_blacklistedregions.ContainsKey(regionhandle))
                             m_blacklistedregions.Add(regionhandle, System.Environment.TickCount);
                     }
-                    m_log.WarnFormat("[WORLD MAP]: Blacklisted region {0}", regionhandle.ToString());
+                    m_log.InfoFormat("[WORLD MAP]: Blacklisted region {0}", regionhandle.ToString());
                 }
             }
 
@@ -606,7 +605,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
             }
             catch (WebException ex)
             {
-                m_log.InfoFormat("[WORLD MAP]: Bad send on GetMapItems {0}", ex.Message);
+                m_log.WarnFormat("[WORLD MAP]: Bad send on GetMapItems {0}", ex.Message);
                 responseMap["connect"] = OSD.FromBoolean(false);
                 lock (m_blacklistedurls)
                 {
@@ -716,7 +715,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
 
         public Hashtable OnHTTPGetMapImage(Hashtable keysvals)
         {
-            m_log.Info("[WORLD MAP]: Sending map image jpeg");
+            m_log.Debug("[WORLD MAP]: Sending map image jpeg");
             Hashtable reply = new Hashtable();
             int statuscode = 200;
             byte[] jpeg = new byte[0];
@@ -857,8 +856,6 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
             // You may ask, why this is in a threadpool to start with..   
             // The reason is so we don't cause the thread to freeze waiting 
             // for the 1 second it costs to start a thread manually.
-            
-            m_log.Warn("[WORLD MAP]: MakeRootAgent Works!");
             if (!threadrunning)
                 ThreadPool.QueueUserWorkItem(new WaitCallback(this.StartThread));