From 784cb6c95c5025d72c80fb6e3f94fb5a2458df08 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 25 Feb 2011 15:21:07 -0800 Subject: [PATCH] Changed some less important messages from Warn to Debug --- .../CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 6 ++---- .../RegionSync/RegionSyncModule/RegionSyncClient.cs | 2 ++ .../RegionSync/RegionSyncModule/RegionSyncServerModule.cs | 2 +- .../RegionSyncModule/SymmetricSync/RegionSyncModule.cs | 2 +- .../Connectors/SimianGrid/SimianPresenceServiceConnector.cs | 6 +++++- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index d6ddc3c337..c18f00affe 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs @@ -254,8 +254,6 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory /// public void QueueAppearanceSend(UUID agentid) { - // m_log.WarnFormat("[AVFACTORY]: Queue appearance send for {0}", agentid); - // 10000 ticks per millisecond, 1000 milliseconds per second long timestamp = DateTime.Now.Ticks + Convert.ToInt64(m_sendtime * 1000 * 10000); lock (m_sendqueue) @@ -263,7 +261,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory m_sendqueue[agentid] = timestamp; m_updateTimer.Start(); } - m_log.WarnFormat("[AVFACTORY]: Queue appearance send for {0} at {1} (now is {2})", agentid, timestamp,DateTime.Now.Ticks); + //m_log.DebugFormat("[AVFACTORY]: Queue appearance send for {0} at {1} (now is {2})", agentid, timestamp,DateTime.Now.Ticks); } public void QueueAppearanceSave(UUID agentid) @@ -382,7 +380,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory { if (kvp.Value < now) { - m_log.WarnFormat("[AVFACTORY]: send appearance for {0} at time {1}", kvp.Key, now); + m_log.DebugFormat("[AVFACTORY]: send appearance for {0} at time {1}", kvp.Key, now); Util.FireAndForget(delegate(object o) { HandleAppearanceSend(kvp.Key); }); m_sendqueue.Remove(kvp.Key); } diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClient.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClient.cs index 3040866e46..8777bcc134 100644 --- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClient.cs +++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClient.cs @@ -770,11 +770,13 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule sp.ControllingClient.SendAnimations(animIDs, seqs, sourceAgentID, objectIDs); } } + /* else { m_log.WarnFormat("{0} Could not send animation for {1} because scene presence not found", LogHeader(), agentID.ToString()); } + */ return; } case RegionSyncMessage.MsgType.BalanceClientLoad: diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServerModule.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServerModule.cs index be029d4687..ba5c7efca5 100644 --- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServerModule.cs +++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncServerModule.cs @@ -282,7 +282,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule // Existing value of 1 indicates that updates are currently being sent so skip updates this pass if (Interlocked.Exchange(ref m_sendingUpdates, 1) == 1) { - m_log.WarnFormat("[REGION SYNC SERVER MODULE] SendUpdates(): An update thread is already running."); + m_log.DebugFormat("[REGION SYNC SERVER MODULE] SendUpdates(): An update thread is already running."); return; } diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs index 318efda12f..1d3219c90c 100644 --- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs +++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs @@ -213,7 +213,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule // Existing value of 1 indicates that updates are currently being sent so skip updates this pass if (Interlocked.Exchange(ref m_sendingUpdates, 1) == 1) { - m_log.WarnFormat("[REGION SYNC MODULE] SendUpdates(): An update thread is already running."); + m_log.DebugFormat("[REGION SYNC MODULE] SendUpdates(): An update thread is already running."); return; } diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs index 678f738abb..6d9f6185ac 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs @@ -203,7 +203,11 @@ namespace OpenSim.Services.Connectors.SimianGrid public PresenceInfo GetAgent(UUID sessionID) { // m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for agent with sessionID " + sessionID); - + if(sessionID == UUID.Zero) + { + m_log.Debug("[SIMIAN PRESENCE CONNECTOR]: GetAgent called with UUID.Zero!"); + return null; + } NameValueCollection requestArgs = new NameValueCollection { { "RequestMethod", "GetSession" },