summaryrefslogtreecommitdiff
path: root/indra/llcharacter/llkeyframefallmotion.cpp
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2021-03-10 11:59:23 -0800
committerCallum Prentice <callum@lindenlab.com>2021-03-10 11:59:23 -0800
commit45af049a479928208a1ad30a90c1db6be1969f9a (patch)
treee40aabda6866b3ca163e0ffe86127fd49332278a /indra/llcharacter/llkeyframefallmotion.cpp
parentb1add74c31cfd28c1e671470991254b4545fb573 (diff)
parent88d837c16e768c5262073a7df965066d4bd8842c (diff)
Merge branch 'master' into DRTVWR-531
Diffstat (limited to 'indra/llcharacter/llkeyframefallmotion.cpp')
-rw-r--r--indra/llcharacter/llkeyframefallmotion.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/llcharacter/llkeyframefallmotion.cpp b/indra/llcharacter/llkeyframefallmotion.cpp
index 7842f0e5fb..60ab2e9929 100644
--- a/indra/llcharacter/llkeyframefallmotion.cpp
+++ b/indra/llcharacter/llkeyframefallmotion.cpp
@@ -70,11 +70,6 @@ LLMotion::LLMotionInitStatus LLKeyframeFallMotion::onInitialize(LLCharacter *cha
// load keyframe data, setup pose and joint states
LLMotion::LLMotionInitStatus result = LLKeyframeMotion::onInitialize(character);
- if (result != LLMotion::STATUS_SUCCESS)
- {
- return result;
- }
-
for (U32 jm=0; jm<mJointMotionList->getNumJointMotions(); jm++)
{
if (!mJointStates[jm]->getJoint())