aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorMelanie2012-01-07 18:11:21 +0000
committerMelanie2012-01-07 18:11:21 +0000
commit4bf2e19898c64060f05535d21711ccb0ff2c31cd (patch)
tree75447b09329bc66eec4191d1c02e7782cb780d67 /OpenSim/Services
parentFix threat level setting on osNpcPlayAnimation (diff)
parentFix threat level setting on osNpcPlayAnimation (diff)
downloadopensim-SC_OLD-4bf2e19898c64060f05535d21711ccb0ff2c31cd.zip
opensim-SC_OLD-4bf2e19898c64060f05535d21711ccb0ff2c31cd.tar.gz
opensim-SC_OLD-4bf2e19898c64060f05535d21711ccb0ff2c31cd.tar.bz2
opensim-SC_OLD-4bf2e19898c64060f05535d21711ccb0ff2c31cd.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/Connectors/Hypergrid/HeloServiceConnector.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/HeloServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/HeloServiceConnector.cs
index c030bca..5c50936 100644
--- a/OpenSim/Services/Connectors/Hypergrid/HeloServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/HeloServiceConnector.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Services.Connectors
66 m_ServerURI = m_ServerURI.TrimEnd('/') + "/helo/"; 66 m_ServerURI = m_ServerURI.TrimEnd('/') + "/helo/";
67 } 67 }
68 } 68 }
69 catch (UriFormatException e) 69 catch (UriFormatException)
70 { 70 {
71 m_log.WarnFormat("[HELO SERVICE]: Malformed URL {0}", serverURI); 71 m_log.WarnFormat("[HELO SERVICE]: Malformed URL {0}", serverURI);
72 } 72 }