aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-02-14 00:08:13 +0000
committerJustin Clark-Casey (justincc)2014-02-14 00:08:13 +0000
commitf49d51308938e397dbe44820b7497437fd785d10 (patch)
tree7ff30646835506629f3a7e184b5cdb7deff7bcdf /OpenSim
parentIf calls to UserAgentServiceConnector fail then throw an exception. This lets... (diff)
downloadopensim-SC_OLD-f49d51308938e397dbe44820b7497437fd785d10.zip
opensim-SC_OLD-f49d51308938e397dbe44820b7497437fd785d10.tar.gz
opensim-SC_OLD-f49d51308938e397dbe44820b7497437fd785d10.tar.bz2
opensim-SC_OLD-f49d51308938e397dbe44820b7497437fd785d10.tar.xz
Change warns associated with UserAgentServiceConnector to debugs, as this is not necessarily a problen with the source simulator (e.g. someone else's remote simulator cannot be contacted).
This is Oren Hurvitz's second patch from http://opensimulator.org/mantis/view.php?id=6956 with a small amount of correction
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs2
-rw-r--r--OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs2
6 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
index d46cb55..c51b30f 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
@@ -289,7 +289,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
289 agentUUI = uasConn.GetUUI(fromAgent, toAgent); 289 agentUUI = uasConn.GetUUI(fromAgent, toAgent);
290 } 290 }
291 catch (Exception e) { 291 catch (Exception e) {
292 m_log.Warn("[HG MESSAGE TRANSFER]: GetUUI call failed ", e); 292 m_log.Debug("[HG MESSAGE TRANSFER]: GetUUI call failed ", e);
293 } 293 }
294 294
295 return agentUUI; 295 return agentUUI;
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index ed8864d..9e6c752 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -1171,7 +1171,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
1171 } 1171 }
1172 catch (Exception e) 1172 catch (Exception e)
1173 { 1173 {
1174 m_log.Warn("[PROFILES]: GetUserInfo call failed ", e); 1174 m_log.Debug("[PROFILES]: GetUserInfo call failed ", e);
1175 account = new Dictionary<string, object>(); 1175 account = new Dictionary<string, object>();
1176 } 1176 }
1177 1177
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index b752639..9736cf0 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -470,7 +470,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
470 } 470 }
471 catch (Exception e) 471 catch (Exception e)
472 { 472 {
473 m_log.Warn("[HG ENTITY TRANSFER MODULE]: GetHomeRegion call failed ", e); 473 m_log.Debug("[HG ENTITY TRANSFER MODULE]: GetHomeRegion call failed ", e);
474 } 474 }
475 475
476 if (finalDestination == null) 476 if (finalDestination == null)
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
index b568857..7b89c2c 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
@@ -138,7 +138,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
138 } 138 }
139 catch (Exception e) 139 catch (Exception e)
140 { 140 {
141 m_log.Warn("[USER MANAGEMENT MODULE]: GetUUID call failed ", e); 141 m_log.Debug("[USER MANAGEMENT MODULE]: GetUUID call failed ", e);
142 } 142 }
143 143
144 if (!userID.Equals(UUID.Zero)) 144 if (!userID.Equals(UUID.Zero))
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index d8b415e..9f0a719 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -479,7 +479,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
479 } 479 }
480 catch (Exception e) 480 catch (Exception e)
481 { 481 {
482 m_log.Warn("[USER MANAGEMENT MODULE]: GetServerURLs call failed ", e); 482 m_log.Debug("[USER MANAGEMENT MODULE]: GetServerURLs call failed ", e);
483 userdata.ServerURLs = new Dictionary<string, object>(); 483 userdata.ServerURLs = new Dictionary<string, object>();
484 } 484 }
485 485
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
index cbd62cb..f869060 100644
--- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
@@ -206,7 +206,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
206 } 206 }
207 catch (Exception e) 207 catch (Exception e)
208 { 208 {
209 m_log.WarnFormat("[USER AGENT CONNECTOR]: {0} call to {1} failed: {2}", methodName, m_ServerURL, e.Message); 209 m_log.DebugFormat("[USER AGENT CONNECTOR]: {0} call to {1} failed: {2}", methodName, m_ServerURL, e.Message);
210 throw; 210 throw;
211 } 211 }
212 212