livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-34747: Fix collision volumes 

broken after refactor; tidy up
master
Angeldark Raymaker 2024-11-12 22:14:43 +00:00
parent d38a74ef23
commit 1b3b0862e0
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/fsjointpose.cpp
View File

@ -1,6 +1,6 @@
/**
* @file fsposingmotion.cpp
* @brief Model for posing your (and other) avatar(s).
* @file fsjointpose.cpp
* @brief Container for the pose of a joint.
*
* $LicenseInfo:firstyear=2024&license=viewerlgpl$
* Phoenix Firestorm Viewer Source Code

2
indra/newview/fsjointpose.h
View File

@ -198,7 +198,7 @@ class FSJointPose
LLQuaternion deltaRotation;
LLQuaternion getTargetRotation() const { return deltaRotation * baseRotation; }
void reflectRotation()
void reflectRotation()
{
baseRotation.mQ[VX] *= -1;
baseRotation.mQ[VZ] *= -1;

2
indra/newview/fsposingmotion.cpp
View File

@ -59,7 +59,7 @@ LLMotion::LLMotionInitStatus FSPosingMotion::onInitialize(LLCharacter *character
if (!targetJoint)
continue;
FSJointPose jointPose = FSJointPose(targetJoint, true);
FSJointPose jointPose = FSJointPose(targetJoint, POSER_JOINT_STATE, true);
mJointPoses.push_back(jointPose);
addJointState(jointPose.getJointState());

2
indra/newview/skins/default/xui/en/floater_fs_poser.xml
View File

@ -807,7 +807,7 @@ width="403">
label="Reset base-rotation on edit"
follows="left|top"
left="5"
tool_tip="When you first edit a rotation, reset it to zero. This means you save a pose and not a diff (see load/save). A green ticks appears next each joint that will export."
tool_tip="When you first edit a rotation, reset it to zero. This means your work can save a pose (and not a diff see load/save). A green tick appears next each joint you have zero-ed export."
top_pad="5"
width="134" />
</panel>