aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorRobert Adams2014-06-18 23:01:39 -0700
committerJustin Clark-Casey2014-08-02 00:49:28 +0100
commit03c6d2b0b463fd656d0b35a8d7b1cfcc7419128d (patch)
tree55e713b4792a23de425a8a47f4443118b5ad2aac /OpenSim
parentBulletSim: more tweeks to AliciaRaven's flying mods. Added parameters (diff)
downloadopensim-SC_OLD-03c6d2b0b463fd656d0b35a8d7b1cfcc7419128d.zip
opensim-SC_OLD-03c6d2b0b463fd656d0b35a8d7b1cfcc7419128d.tar.gz
opensim-SC_OLD-03c6d2b0b463fd656d0b35a8d7b1cfcc7419128d.tar.bz2
opensim-SC_OLD-03c6d2b0b463fd656d0b35a8d7b1cfcc7419128d.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')
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs1
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