diff options
| author | BlueWall | 2013-01-15 10:08:27 -0500 |
|---|---|---|
| committer | BlueWall | 2013-01-15 10:08:27 -0500 |
| commit | f54b398540698e6e09022fe77b6405624b532f5c (patch) | |
| tree | 74581e7176d06dd8e2bff43720a3033ccfe6df0e /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | Add Json-Rpc 2.0 To Registered Handlers (diff) | |
| parent | BulletSim: tweeks to improve hover. (diff) | |
| download | opensim-SC_OLD-f54b398540698e6e09022fe77b6405624b532f5c.zip opensim-SC_OLD-f54b398540698e6e09022fe77b6405624b532f5c.tar.gz opensim-SC_OLD-f54b398540698e6e09022fe77b6405624b532f5c.tar.bz2 opensim-SC_OLD-f54b398540698e6e09022fe77b6405624b532f5c.tar.xz | |
Merge branch 'master' of /home/opensim/var/repo/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 232861e..44e8fdf 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -4050,9 +4050,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4050 | rigidBody, | 4050 | rigidBody, |
| 4051 | m_localId); | 4051 | m_localId); |
| 4052 | } | 4052 | } |
| 4053 | catch | 4053 | catch (Exception e) |
| 4054 | { | 4054 | { |
| 4055 | m_log.ErrorFormat("[SCENE]: caught exception meshing object {0}. Object set to phantom.", m_uuid); | 4055 | m_log.ErrorFormat("[SCENE]: caught exception meshing object {0}. Object set to phantom. e={1}", m_uuid, e); |
| 4056 | pa = null; | 4056 | pa = null; |
| 4057 | } | 4057 | } |
| 4058 | 4058 | ||