Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
commit
c38178b07a
|
|
@ -387,13 +387,10 @@ void FSManipRotateJoint::setJoint(LLJoint* joint)
|
||||||
void FSManipRotateJoint::setAvatar(LLVOAvatar* avatar)
|
void FSManipRotateJoint::setAvatar(LLVOAvatar* avatar)
|
||||||
{
|
{
|
||||||
mAvatar = avatar;
|
mAvatar = avatar;
|
||||||
|
|
||||||
if (!avatar)
|
if (!avatar)
|
||||||
mJoint = nullptr;
|
mJoint = nullptr;
|
||||||
|
|
||||||
if (!mJoint)
|
if (mAvatar && mJoint)
|
||||||
return;
|
|
||||||
|
|
||||||
setJoint(avatar->getJoint(mJoint->getJointNum()));
|
setJoint(avatar->getJoint(mJoint->getJointNum()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue