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

indra/newview/fsmaniprotatejoint.cpp

@@ -387,13 +387,10 @@ void FSManipRotateJoint::setJoint(LLJoint* joint)
 void FSManipRotateJoint::setAvatar(LLVOAvatar* avatar)
 {
     mAvatar = avatar;
-
     if (!avatar)
         mJoint = nullptr;
 
-    if (!mJoint)
-        return;
-
+    if (mAvatar && mJoint)
         setJoint(avatar->getJoint(mJoint->getJointNum()));
 }