diff options
| author | Melanie | 2013-01-16 01:11:20 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-16 01:11:20 +0000 |
| commit | fc5711fa7ab3bcd0d81737735d098f070a7132bb (patch) | |
| tree | 06fbc4ebf2a4788f4ffd65010d6abadfb2ffafae /OpenSim/Region/Framework/Scenes | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | BulletSim: disable center-of-mass computation for linksets until debugged. Mo... (diff) | |
| download | opensim-SC-fc5711fa7ab3bcd0d81737735d098f070a7132bb.zip opensim-SC-fc5711fa7ab3bcd0d81737735d098f070a7132bb.tar.gz opensim-SC-fc5711fa7ab3bcd0d81737735d098f070a7132bb.tar.bz2 opensim-SC-fc5711fa7ab3bcd0d81737735d098f070a7132bb.tar.xz | |
Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index f21058b..b59ba68 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -4649,9 +4649,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4649 | PhysicsShapeType, | 4649 | PhysicsShapeType, |
| 4650 | m_localId); | 4650 | m_localId); |
| 4651 | } | 4651 | } |
| 4652 | catch (Exception ex) | 4652 | catch (Exception e) |
| 4653 | { | 4653 | { |
| 4654 | m_log.ErrorFormat("[SCENE]: AddToPhysics object {0} failed: {1}", m_uuid, ex.Message); | 4654 | m_log.ErrorFormat("[SCENE]: caught exception meshing object {0}. Object set to phantom. e={1}", m_uuid, e); |
| 4655 | pa = null; | 4655 | pa = null; |
| 4656 | } | 4656 | } |
| 4657 | 4657 | ||
| @@ -5288,4 +5288,4 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 5288 | } | 5288 | } |
| 5289 | } | 5289 | } |
| 5290 | } | 5290 | } |
| 5291 | } \ No newline at end of file | 5291 | } |