Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm

2025-11-29 16:24:16 +01:00 · 2025-11-29 16:24:16 +01:00 · c38178b07a
parent 567874a5a7 5486a52dbe
commit c38178b07a
1 changed files with 2 additions and 5 deletions
--- a/indra/newview/fsmaniprotatejoint.cpp
+++ b/indra/newview/fsmaniprotatejoint.cpp
@ -387,14 +387,11 @@ void FSManipRotateJoint::setJoint(LLJoint* joint)
 void FSManipRotateJoint::setAvatar(LLVOAvatar* avatar)
 {
    mAvatar = avatar;
-
    if (!avatar)
        mJoint = nullptr;

-    if (!mJoint)
-        return;
-
-    setJoint(avatar->getJoint(mJoint->getJointNum()));
+    if (mAvatar && mJoint)
+        setJoint(avatar->getJoint(mJoint->getJointNum()));
 }

 /**