aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorTom Grimshaw2010-05-19 00:21:38 -0700
committerTom Grimshaw2010-05-19 00:21:38 -0700
commit71a95900fd19685974b6cdb024b44b71c2847d70 (patch)
treed0098be08c1b278bb7fa0c7f7f1c207443fd6ba9 /OpenSim/Services
parentFix a null reference issue in cmGetAvatarList() (diff)
parentAllow remote admin to be used on a different port from the main region port (diff)
downloadopensim-SC_OLD-71a95900fd19685974b6cdb024b44b71c2847d70.zip
opensim-SC_OLD-71a95900fd19685974b6cdb024b44b71c2847d70.tar.gz
opensim-SC_OLD-71a95900fd19685974b6cdb024b44b71c2847d70.tar.bz2
opensim-SC_OLD-71a95900fd19685974b6cdb024b44b71c2847d70.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services')
-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;