From 0d29f7391629defa0ec1463fb24486ee76cca527 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 26 May 2011 19:13:03 -0700 Subject: [PATCH] Commented a few extra debug messages. --- .../Framework/UserManagement/UserManagementModule.cs | 4 ++-- .../Handlers/Hypergrid/HGFriendsServerPostHandler.cs | 5 +---- .../Connectors/Hypergrid/UserAgentServiceConnector.cs | 2 -- .../InstantMessage/InstantMessageServiceConnector.cs | 4 ++-- .../HypergridService/HGInstantMessageService.cs | 10 +++++----- 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs index 4d073b2fe0..f721195ccf 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs @@ -143,7 +143,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement void HandleUUIDNameRequest(UUID uuid, IClientAPI remote_client) { - m_log.DebugFormat("[XXX] HandleUUIDNameRequest {0}", uuid); + //m_log.DebugFormat("[XXX] HandleUUIDNameRequest {0}", uuid); if (m_Scenes[0].LibraryService != null && (m_Scenes[0].LibraryService.LibraryRootFolder.Owner == uuid)) { remote_client.SendNameReply(uuid, "Mr", "OpenSim"); @@ -213,7 +213,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement public string GetUserName(UUID uuid) { - m_log.DebugFormat("[XXX] GetUserName {0}", uuid); + //m_log.DebugFormat("[XXX] GetUserName {0}", uuid); string[] names = GetUserNames(uuid); if (names.Length == 2) { diff --git a/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs b/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs index 841811e843..5c89d0fd75 100644 --- a/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs @@ -140,16 +140,13 @@ namespace OpenSim.Server.Handlers.Hypergrid byte[] NewFriendship(Dictionary request) { - m_log.DebugFormat("[XXX] 1"); if (!VerifyServiceKey(request)) return FailureResult(); - m_log.DebugFormat("[XXX] 2"); // OK, can proceed FriendInfo friend = new FriendInfo(request); UUID friendID; string tmp = string.Empty; - m_log.DebugFormat("[XXX] 3"); if (!Util.ParseUniversalUserIdentifier(friend.Friend, out friendID, out tmp, out tmp, out tmp, out tmp)) return FailureResult(); @@ -221,7 +218,7 @@ namespace OpenSim.Server.Handlers.Hypergrid return false; } - m_log.DebugFormat("[XXX] Verification ok"); + m_log.DebugFormat("[HGFRIENDS HANDLER]: Verification ok"); return true; } diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs index 1c01563014..046f755f47 100644 --- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs @@ -576,7 +576,6 @@ namespace OpenSim.Services.Connectors.Hypergrid XmlRpcResponse response = null; try { - m_log.DebugFormat("[XXX]: Calling locate_user on {0}", m_ServerURL); response = request.Send(m_ServerURL, 10000); } catch (Exception e) @@ -636,7 +635,6 @@ namespace OpenSim.Services.Connectors.Hypergrid XmlRpcResponse response = null; try { - m_log.DebugFormat("[XXX]: Calling get_uuid on {0}", m_ServerURL); response = request.Send(m_ServerURL, 10000); } catch (Exception e) diff --git a/OpenSim/Services/Connectors/InstantMessage/InstantMessageServiceConnector.cs b/OpenSim/Services/Connectors/InstantMessage/InstantMessageServiceConnector.cs index 2a922de5a4..e94e3358e9 100644 --- a/OpenSim/Services/Connectors/InstantMessage/InstantMessageServiceConnector.cs +++ b/OpenSim/Services/Connectors/InstantMessage/InstantMessageServiceConnector.cs @@ -69,12 +69,12 @@ namespace OpenSim.Services.Connectors.InstantMessage { if ((string)responseData["success"] == "TRUE") { - m_log.DebugFormat("[XXX] Success"); + //m_log.DebugFormat("[XXX] Success"); return true; } else { - m_log.DebugFormat("[XXX] Fail"); + //m_log.DebugFormat("[XXX] Fail"); return false; } } diff --git a/OpenSim/Services/HypergridService/HGInstantMessageService.cs b/OpenSim/Services/HypergridService/HGInstantMessageService.cs index ca0fd7f350..dd5fd71baf 100644 --- a/OpenSim/Services/HypergridService/HGInstantMessageService.cs +++ b/OpenSim/Services/HypergridService/HGInstantMessageService.cs @@ -106,12 +106,12 @@ namespace OpenSim.Services.HypergridService public bool IncomingInstantMessage(GridInstantMessage im) { - m_log.DebugFormat("[HG IM SERVICE]: Received message {0} from {1} to {2}", im.message, im.fromAgentID, im.toAgentID); + m_log.DebugFormat("[HG IM SERVICE]: Received message from {0} to {1}", im.fromAgentID, im.toAgentID); UUID toAgentID = new UUID(im.toAgentID); if (m_IMSimConnector != null) { - m_log.DebugFormat("[XXX] SendIMToRegion local im connector"); + //m_log.DebugFormat("[XXX] SendIMToRegion local im connector"); return m_IMSimConnector.SendInstantMessage(im); } else @@ -120,7 +120,7 @@ namespace OpenSim.Services.HypergridService public bool OutgoingInstantMessage(GridInstantMessage im, string url) { - m_log.DebugFormat("[HG IM SERVICE]: Sending message {0} from {1} to {2}@{3}", im.message, im.fromAgentID, im.toAgentID, url); + m_log.DebugFormat("[HG IM SERVICE]: Sending message from {0} to {1}@{2}", im.fromAgentID, im.toAgentID, url); if (url != string.Empty) return TrySendInstantMessage(im, url, true); else @@ -165,7 +165,7 @@ namespace OpenSim.Services.HypergridService } } - m_log.DebugFormat("[XXX] Neeed lookup ? {0}", (lookupAgent ? "yes" : "no")); + //m_log.DebugFormat("[XXX] Neeed lookup ? {0}", (lookupAgent ? "yes" : "no")); // Are we needing to look-up an agent? if (lookupAgent) @@ -178,7 +178,7 @@ namespace OpenSim.Services.HypergridService { if (p.RegionID != UUID.Zero) { - m_log.DebugFormat("[XXX]: Found presence in {0}", p.RegionID); + //m_log.DebugFormat("[XXX]: Found presence in {0}", p.RegionID); upd = p; break; }