OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Quieten down log messages from the Friends module

0.6.3-post-fixes
Justin Clarke Casey 2009-02-13 18:02:24 +00:00
parent d31810d548
commit a46c9b0eea
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
View File

@ -502,8 +502,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
// This event won't be raised unless we have that agent, // This event won't be raised unless we have that agent,
// so we can depend on the above not trying to send // so we can depend on the above not trying to send
// via grid again // via grid again
m_log.DebugFormat("[FRIEND]: Got GridIM from {0}, to {1}, imSession {2}, message {3}, dialog {4}", //m_log.DebugFormat("[FRIEND]: Got GridIM from {0}, to {1}, imSession {2}, message {3}, dialog {4}",
msg.fromAgentID, msg.toAgentID, msg.imSessionID, msg.message, msg.dialog); // msg.fromAgentID, msg.toAgentID, msg.imSessionID, msg.message, msg.dialog);
if (msg.dialog == (byte)InstantMessageDialog.FriendshipOffered || if (msg.dialog == (byte)InstantMessageDialog.FriendshipOffered ||
msg.dialog == (byte)InstantMessageDialog.FriendshipAccepted || msg.dialog == (byte)InstantMessageDialog.FriendshipAccepted ||
@ -512,7 +512,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
// this should succeed as we *know* the root agent is here. // this should succeed as we *know* the root agent is here.
m_TransferModule.SendInstantMessage(msg, m_TransferModule.SendInstantMessage(msg,
delegate(bool success) { delegate(bool success) {
m_log.DebugFormat("[FRIEND]: sending IM success = {0}", success); //m_log.DebugFormat("[FRIEND]: sending IM success = {0}", success);
} }
); );
} }
@ -894,7 +894,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
ScenePresence agent = GetAnyPresenceFromAgentID(uuid); ScenePresence agent = GetAnyPresenceFromAgentID(uuid);
if (agent != null) if (agent != null)
{ {
m_log.DebugFormat("[FRIEND]: Found local agent {0}", agent.Name); //m_log.DebugFormat("[FRIEND]: Found local agent {0}", agent.Name);
// friend is online and on this server... // friend is online and on this server...
if (iAmOnline) agent.ControllingClient.SendAgentOnline(agentArr); if (iAmOnline) agent.ControllingClient.SendAgentOnline(agentArr);
@ -906,7 +906,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
} }
else else
{ {
m_log.DebugFormat("[FRIEND]: Friend {0} ({1}) is offline; not sending.", uuid, i); //m_log.DebugFormat("[FRIEND]: Friend {0} ({1}) is offline; not sending.", uuid, i);
// friend is offline => no need to try sending // friend is offline => no need to try sending
friendIDsToSendTo.RemoveAt(i); friendIDsToSendTo.RemoveAt(i);
@ -939,8 +939,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
// send bulk updates to the region // send bulk updates to the region
foreach (KeyValuePair<ulong, List<UUID>> pair in friendsInRegion) foreach (KeyValuePair<ulong, List<UUID>> pair in friendsInRegion)
{ {
m_log.DebugFormat("[FRIEND]: Inform {0} friends in region {1} that user {2} is {3}line", //m_log.DebugFormat("[FRIEND]: Inform {0} friends in region {1} that user {2} is {3}line",
pair.Value.Count, pair.Key, client.Name, iAmOnline ? "on" : "off"); // pair.Value.Count, pair.Key, client.Name, iAmOnline ? "on" : "off");
friendIDsToSendTo.AddRange(m_initialScene.InformFriendsInOtherRegion(client.AgentId, pair.Key, pair.Value, iAmOnline)); friendIDsToSendTo.AddRange(m_initialScene.InformFriendsInOtherRegion(client.AgentId, pair.Key, pair.Value, iAmOnline));
} }

2
OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
View File

@ -526,7 +526,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
SendGridInstantMessageViaXMLRPCAsync(im, result, SendGridInstantMessageViaXMLRPCAsync(im, result,
upd.Handle); upd.Handle);
} }
} }
else else
{ {
@ -544,7 +543,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
m_log.WarnFormat("[GRID INSTANT MESSAGE]: Unable to find user {0}", toAgentID); m_log.WarnFormat("[GRID INSTANT MESSAGE]: Unable to find user {0}", toAgentID);
result(false); result(false);
} }
} }
/// <summary> /// <summary>

1
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -1816,7 +1816,6 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
SubscribeToClientEvents(client); SubscribeToClientEvents(client);
ScenePresence presence; ScenePresence presence;