diff options
| author | Justin Clark-Casey (justincc) | 2013-01-15 00:24:51 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-01-15 00:24:51 +0000 |
| commit | c846cefda97bd59b7707147d7ae1a520c9121127 (patch) | |
| tree | ee23e4b451087874a8149348e010a905817121f7 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | refactor: Simplify ScriptInstance by retaining reference to SceneObjectPart i... (diff) | |
| parent | BulletSim: fix not moving physical objects below terrain to over terrain. (diff) | |
| download | opensim-SC-c846cefda97bd59b7707147d7ae1a520c9121127.zip opensim-SC-c846cefda97bd59b7707147d7ae1a520c9121127.tar.gz opensim-SC-c846cefda97bd59b7707147d7ae1a520c9121127.tar.bz2 opensim-SC-c846cefda97bd59b7707147d7ae1a520c9121127.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/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 | ||