aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2009-12-11 02:49:41 +0000
committerMelanie2009-12-11 02:49:41 +0000
commit54e4dcf4541bde4a4ba2287fc6da6a6b81794ad7 (patch)
treef38912966d90a708828765fbb025378cf95f2e69
parentRefix the fix (diff)
parentRefix the fix (diff)
downloadopensim-SC-54e4dcf4541bde4a4ba2287fc6da6a6b81794ad7.zip
opensim-SC-54e4dcf4541bde4a4ba2287fc6da6a6b81794ad7.tar.gz
opensim-SC-54e4dcf4541bde4a4ba2287fc6da6a6b81794ad7.tar.bz2
opensim-SC-54e4dcf4541bde4a4ba2287fc6da6a6b81794ad7.tar.xz
Merge branch 'master' into careminster
-rw-r--r--OpenSim/Client/Linden/LLProxyLoginModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Client/Linden/LLProxyLoginModule.cs b/OpenSim/Client/Linden/LLProxyLoginModule.cs
index ad67c44..efae234 100644
--- a/OpenSim/Client/Linden/LLProxyLoginModule.cs
+++ b/OpenSim/Client/Linden/LLProxyLoginModule.cs
@@ -304,7 +304,7 @@ namespace OpenSim.Client.Linden
304 } 304 }
305 catch (Exception e) 305 catch (Exception e)
306 { 306 {
307 m_log.WarnFormat("[CLIENT]: Unable to receive user. Reason: {0}", e); 307 m_log.WarnFormat("[CLIENT]: Unable to receive user. Reason: {0} ({1})", e, e.StackTrace);
308 Hashtable respdata = new Hashtable(); 308 Hashtable respdata = new Hashtable();
309 respdata["success"] = "FALSE"; 309 respdata["success"] = "FALSE";
310 respdata["reason"] = "Exception occurred"; 310 respdata["reason"] = "Exception occurred";