diff options
author | Robert Adams | 2014-06-18 23:01:39 -0700 |
---|---|---|
committer | Robert Adams | 2014-06-18 23:01:39 -0700 |
commit | 4651cd1f50add12aca5d45bdde1b9990ce3c29de (patch) | |
tree | aaf199d90fb591f3bb305f98d59d96d5605203e7 /OpenSim/Region | |
parent | BulletSim: more tweeks to AliciaRaven's flying mods. Added parameters (diff) | |
download | opensim-SC_OLD-4651cd1f50add12aca5d45bdde1b9990ce3c29de.zip opensim-SC_OLD-4651cd1f50add12aca5d45bdde1b9990ce3c29de.tar.gz opensim-SC_OLD-4651cd1f50add12aca5d45bdde1b9990ce3c29de.tar.bz2 opensim-SC_OLD-4651cd1f50add12aca5d45bdde1b9990ce3c29de.tar.xz |
BulletSim: stop processing linkset child when it is discovered that the
child doesn't have a physical shape. Another attempt at fixing Mantis 7191.
Diffstat (limited to 'OpenSim/Region')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs index 67cb2f6..5217452 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs | |||
@@ -404,6 +404,7 @@ public sealed class BSLinksetCompound : BSLinkset | |||
404 | m_physicsScene.Logger.WarnFormat("{0} Linkset rebuild warning. If this happens more than one or two times, please report in Mantis 7191", LogHeader); | 404 | m_physicsScene.Logger.WarnFormat("{0} Linkset rebuild warning. If this happens more than one or two times, please report in Mantis 7191", LogHeader); |
405 | m_physicsScene.Logger.WarnFormat("{0} pName={1}, childIdx={2}, shape={3}", | 405 | m_physicsScene.Logger.WarnFormat("{0} pName={1}, childIdx={2}, shape={3}", |
406 | LogHeader, LinksetRoot.Name, cPrim.LinksetChildIndex, childShape); | 406 | LogHeader, LinksetRoot.Name, cPrim.LinksetChildIndex, childShape); |
407 | return false; // 'false' says to move onto the next child in the list | ||
407 | } | 408 | } |
408 | } | 409 | } |
409 | 410 | ||