summaryrefslogtreecommitdiff
path: root/indra/llcharacter/llkeyframefallmotion.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2021-03-08 13:56:16 +0000
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2021-03-08 13:56:16 +0000
commitc83e740ef94e16ba85574454f3138905edecb029 (patch)
tree6e10779ff7b2df5194a3df9d100ba28d53883166 /indra/llcharacter/llkeyframefallmotion.cpp
parent2b385841f3031d599bdb226f0f859e51b09870f8 (diff)
Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519"
This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
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())