From 1b3b0862e0846a6121357df634284dd0c1bdb496 Mon Sep 17 00:00:00 2001 From: Angeldark Raymaker Date: Tue, 12 Nov 2024 22:14:43 +0000 Subject: [PATCH] FIRE-34747: Fix collision volumes broken after refactor; tidy up --- indra/newview/fsjointpose.cpp | 4 ++-- indra/newview/fsjointpose.h | 2 +- indra/newview/fsposingmotion.cpp | 2 +- indra/newview/skins/default/xui/en/floater_fs_poser.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/indra/newview/fsjointpose.cpp b/indra/newview/fsjointpose.cpp index 7f8eec502c..25c77e6dfe 100644 --- a/indra/newview/fsjointpose.cpp +++ b/indra/newview/fsjointpose.cpp @@ -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 diff --git a/indra/newview/fsjointpose.h b/indra/newview/fsjointpose.h index 8d0c28a706..affa394225 100644 --- a/indra/newview/fsjointpose.h +++ b/indra/newview/fsjointpose.h @@ -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; diff --git a/indra/newview/fsposingmotion.cpp b/indra/newview/fsposingmotion.cpp index 615f0e9065..d16e9f5374 100644 --- a/indra/newview/fsposingmotion.cpp +++ b/indra/newview/fsposingmotion.cpp @@ -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()); diff --git a/indra/newview/skins/default/xui/en/floater_fs_poser.xml b/indra/newview/skins/default/xui/en/floater_fs_poser.xml index ad93e2e620..a9314c8e1c 100644 --- a/indra/newview/skins/default/xui/en/floater_fs_poser.xml +++ b/indra/newview/skins/default/xui/en/floater_fs_poser.xml @@ -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" />