aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2010-11-16 10:22:15 +0000
committerMelanie2010-11-16 10:22:15 +0000
commite7e3c74fb738ed922905c465d6f1efac416ef2e8 (patch)
treea98edb0028676fe4132248bdb3f508d2e57be202 /OpenSim/Region
parentCan't detach an object from within the script thread because it will throw. U... (diff)
parentFix: Write asset data into Asset.db when using SQLite (diff)
downloadopensim-SC_OLD-e7e3c74fb738ed922905c465d6f1efac416ef2e8.zip
opensim-SC_OLD-e7e3c74fb738ed922905c465d6f1efac416ef2e8.tar.gz
opensim-SC_OLD-e7e3c74fb738ed922905c465d6f1efac416ef2e8.tar.bz2
opensim-SC_OLD-e7e3c74fb738ed922905c465d6f1efac416ef2e8.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 4aa19d1..8d85d1a 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -651,8 +651,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
651 catch (Exception e) 651 catch (Exception e)
652 { 652 {
653 // Make sure that we see any exception caused by the asynchronous operation. 653 // Make sure that we see any exception caused by the asynchronous operation.
654 m_log.Error( 654 m_log.ErrorFormat(
655 string.Format("[LLCLIENTVIEW]: Caught exception while processing {0}", packetObject.Pack), e); 655 "[LLCLIENTVIEW]: Caught exception while processing {0} for {1}, {2} {3}",
656 packetObject.Pack, Name, e.Message, e.StackTrace);
656 } 657 }
657 } 658 }
658 659