aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-05-18 15:31:19 +0100
committerMelanie2010-05-18 15:31:19 +0100
commit1c3790a70db135157e972f5600486ea8f86fae52 (patch)
tree36b7e3b0de991301c3f08f90c73659a0ca0ba9c3
parentDon't send kill packets to child agents as we close them (diff)
parentChange an exception reporting to include the stack trace. "e.Message" just (diff)
downloadopensim-SC-1c3790a70db135157e972f5600486ea8f86fae52.zip
opensim-SC-1c3790a70db135157e972f5600486ea8f86fae52.tar.gz
opensim-SC-1c3790a70db135157e972f5600486ea8f86fae52.tar.bz2
opensim-SC-1c3790a70db135157e972f5600486ea8f86fae52.tar.xz
Merge branch 'master' into careminster-presence-refactor
-rw-r--r--OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
index a29ac28..d7cb015 100644
--- a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
+++ b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
@@ -158,7 +158,7 @@ namespace OpenSim.Services.Connectors.Friends
158 } 158 }
159 catch (Exception e) 159 catch (Exception e)
160 { 160 {
161 m_log.DebugFormat("[FRIENDS CONNECTOR]: Exception when contacting remote sim: {0}", e.Message); 161 m_log.DebugFormat("[FRIENDS CONNECTOR]: Exception when contacting remote sim: {0}", e.ToString());
162 } 162 }
163 163
164 return false; 164 return false;