aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs4
-rw-r--r--OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs5
-rw-r--r--OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs2
-rw-r--r--OpenSim/Services/Connectors/InstantMessage/InstantMessageServiceConnector.cs4
-rw-r--r--OpenSim/Services/HypergridService/HGInstantMessageService.cs10
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 4d073b2..f721195 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
143 143
144 void HandleUUIDNameRequest(UUID uuid, IClientAPI remote_client) 144 void HandleUUIDNameRequest(UUID uuid, IClientAPI remote_client)
145 { 145 {
146 m_log.DebugFormat("[XXX] HandleUUIDNameRequest {0}", uuid); 146 //m_log.DebugFormat("[XXX] HandleUUIDNameRequest {0}", uuid);
147 if (m_Scenes[0].LibraryService != null && (m_Scenes[0].LibraryService.LibraryRootFolder.Owner == uuid)) 147 if (m_Scenes[0].LibraryService != null && (m_Scenes[0].LibraryService.LibraryRootFolder.Owner == uuid))
148 { 148 {
149 remote_client.SendNameReply(uuid, "Mr", "OpenSim"); 149 remote_client.SendNameReply(uuid, "Mr", "OpenSim");
@@ -213,7 +213,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
213 213
214 public string GetUserName(UUID uuid) 214 public string GetUserName(UUID uuid)
215 { 215 {
216 m_log.DebugFormat("[XXX] GetUserName {0}", uuid); 216 //m_log.DebugFormat("[XXX] GetUserName {0}", uuid);
217 string[] names = GetUserNames(uuid); 217 string[] names = GetUserNames(uuid);
218 if (names.Length == 2) 218 if (names.Length == 2)
219 { 219 {
diff --git a/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs b/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs
index 841811e..5c89d0f 100644
--- a/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs
@@ -140,16 +140,13 @@ namespace OpenSim.Server.Handlers.Hypergrid
140 140
141 byte[] NewFriendship(Dictionary<string, object> request) 141 byte[] NewFriendship(Dictionary<string, object> request)
142 { 142 {
143 m_log.DebugFormat("[XXX] 1");
144 if (!VerifyServiceKey(request)) 143 if (!VerifyServiceKey(request))
145 return FailureResult(); 144 return FailureResult();
146 145
147 m_log.DebugFormat("[XXX] 2");
148 // OK, can proceed 146 // OK, can proceed
149 FriendInfo friend = new FriendInfo(request); 147 FriendInfo friend = new FriendInfo(request);
150 UUID friendID; 148 UUID friendID;
151 string tmp = string.Empty; 149 string tmp = string.Empty;
152 m_log.DebugFormat("[XXX] 3");
153 if (!Util.ParseUniversalUserIdentifier(friend.Friend, out friendID, out tmp, out tmp, out tmp, out tmp)) 150 if (!Util.ParseUniversalUserIdentifier(friend.Friend, out friendID, out tmp, out tmp, out tmp, out tmp))
154 return FailureResult(); 151 return FailureResult();
155 152
@@ -221,7 +218,7 @@ namespace OpenSim.Server.Handlers.Hypergrid
221 return false; 218 return false;
222 } 219 }
223 220
224 m_log.DebugFormat("[XXX] Verification ok"); 221 m_log.DebugFormat("[HGFRIENDS HANDLER]: Verification ok");
225 return true; 222 return true;
226 } 223 }
227 224
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
index 1c01563..046f755 100644
--- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
@@ -576,7 +576,6 @@ namespace OpenSim.Services.Connectors.Hypergrid
576 XmlRpcResponse response = null; 576 XmlRpcResponse response = null;
577 try 577 try
578 { 578 {
579 m_log.DebugFormat("[XXX]: Calling locate_user on {0}", m_ServerURL);
580 response = request.Send(m_ServerURL, 10000); 579 response = request.Send(m_ServerURL, 10000);
581 } 580 }
582 catch (Exception e) 581 catch (Exception e)
@@ -636,7 +635,6 @@ namespace OpenSim.Services.Connectors.Hypergrid
636 XmlRpcResponse response = null; 635 XmlRpcResponse response = null;
637 try 636 try
638 { 637 {
639 m_log.DebugFormat("[XXX]: Calling get_uuid on {0}", m_ServerURL);
640 response = request.Send(m_ServerURL, 10000); 638 response = request.Send(m_ServerURL, 10000);
641 } 639 }
642 catch (Exception e) 640 catch (Exception e)
diff --git a/OpenSim/Services/Connectors/InstantMessage/InstantMessageServiceConnector.cs b/OpenSim/Services/Connectors/InstantMessage/InstantMessageServiceConnector.cs
index 2a922de..e94e335 100644
--- a/OpenSim/Services/Connectors/InstantMessage/InstantMessageServiceConnector.cs
+++ b/OpenSim/Services/Connectors/InstantMessage/InstantMessageServiceConnector.cs
@@ -69,12 +69,12 @@ namespace OpenSim.Services.Connectors.InstantMessage
69 { 69 {
70 if ((string)responseData["success"] == "TRUE") 70 if ((string)responseData["success"] == "TRUE")
71 { 71 {
72 m_log.DebugFormat("[XXX] Success"); 72 //m_log.DebugFormat("[XXX] Success");
73 return true; 73 return true;
74 } 74 }
75 else 75 else
76 { 76 {
77 m_log.DebugFormat("[XXX] Fail"); 77 //m_log.DebugFormat("[XXX] Fail");
78 return false; 78 return false;
79 } 79 }
80 } 80 }
diff --git a/OpenSim/Services/HypergridService/HGInstantMessageService.cs b/OpenSim/Services/HypergridService/HGInstantMessageService.cs
index ca0fd7f..dd5fd71 100644
--- a/OpenSim/Services/HypergridService/HGInstantMessageService.cs
+++ b/OpenSim/Services/HypergridService/HGInstantMessageService.cs
@@ -106,12 +106,12 @@ namespace OpenSim.Services.HypergridService
106 106
107 public bool IncomingInstantMessage(GridInstantMessage im) 107 public bool IncomingInstantMessage(GridInstantMessage im)
108 { 108 {
109 m_log.DebugFormat("[HG IM SERVICE]: Received message {0} from {1} to {2}", im.message, im.fromAgentID, im.toAgentID); 109 m_log.DebugFormat("[HG IM SERVICE]: Received message from {0} to {1}", im.fromAgentID, im.toAgentID);
110 UUID toAgentID = new UUID(im.toAgentID); 110 UUID toAgentID = new UUID(im.toAgentID);
111 111
112 if (m_IMSimConnector != null) 112 if (m_IMSimConnector != null)
113 { 113 {
114 m_log.DebugFormat("[XXX] SendIMToRegion local im connector"); 114 //m_log.DebugFormat("[XXX] SendIMToRegion local im connector");
115 return m_IMSimConnector.SendInstantMessage(im); 115 return m_IMSimConnector.SendInstantMessage(im);
116 } 116 }
117 else 117 else
@@ -120,7 +120,7 @@ namespace OpenSim.Services.HypergridService
120 120
121 public bool OutgoingInstantMessage(GridInstantMessage im, string url) 121 public bool OutgoingInstantMessage(GridInstantMessage im, string url)
122 { 122 {
123 m_log.DebugFormat("[HG IM SERVICE]: Sending message {0} from {1} to {2}@{3}", im.message, im.fromAgentID, im.toAgentID, url); 123 m_log.DebugFormat("[HG IM SERVICE]: Sending message from {0} to {1}@{2}", im.fromAgentID, im.toAgentID, url);
124 if (url != string.Empty) 124 if (url != string.Empty)
125 return TrySendInstantMessage(im, url, true); 125 return TrySendInstantMessage(im, url, true);
126 else 126 else
@@ -165,7 +165,7 @@ namespace OpenSim.Services.HypergridService
165 } 165 }
166 } 166 }
167 167
168 m_log.DebugFormat("[XXX] Neeed lookup ? {0}", (lookupAgent ? "yes" : "no")); 168 //m_log.DebugFormat("[XXX] Neeed lookup ? {0}", (lookupAgent ? "yes" : "no"));
169 169
170 // Are we needing to look-up an agent? 170 // Are we needing to look-up an agent?
171 if (lookupAgent) 171 if (lookupAgent)
@@ -178,7 +178,7 @@ namespace OpenSim.Services.HypergridService
178 { 178 {
179 if (p.RegionID != UUID.Zero) 179 if (p.RegionID != UUID.Zero)
180 { 180 {
181 m_log.DebugFormat("[XXX]: Found presence in {0}", p.RegionID); 181 //m_log.DebugFormat("[XXX]: Found presence in {0}", p.RegionID);
182 upd = p; 182 upd = p;
183 break; 183 break;
184 } 184 }