diff options
| author | Jonathan Freedman | 2010-11-21 19:51:23 -0800 |
|---|---|---|
| committer | Jonathan Freedman | 2010-11-21 19:51:23 -0800 |
| commit | 562147475cc24a18da2b812a69ce2330c7633cf6 (patch) | |
| tree | 1168b5591f615442f8a09fd9776209d0923c2b3d /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |
| parent | Merge git://github.com/opensim/opensim into mantis5110 (diff) | |
| parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
| download | opensim-SC_OLD-562147475cc24a18da2b812a69ce2330c7633cf6.zip opensim-SC_OLD-562147475cc24a18da2b812a69ce2330c7633cf6.tar.gz opensim-SC_OLD-562147475cc24a18da2b812a69ce2330c7633cf6.tar.bz2 opensim-SC_OLD-562147475cc24a18da2b812a69ce2330c7633cf6.tar.xz | |
Merge https://github.com/opensim/opensim into mantis5110
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 5 |
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 | ||