diff --git a/indra/newview/fsfloaterposer.cpp b/indra/newview/fsfloaterposer.cpp index bd3bfb70a6..e603fac9e2 100644 --- a/indra/newview/fsfloaterposer.cpp +++ b/indra/newview/fsfloaterposer.cpp @@ -691,9 +691,6 @@ void FSFloaterPoser::onClickBrowsePoseCache() void FSFloaterPoser::onClickSymmetrize(const S32 ID) { - if (notDoubleClicked()) - return; - LLVOAvatar* avatar = getUiSelectedAvatar(); if (!avatar) return; @@ -861,27 +858,13 @@ void FSFloaterPoser::onPoseMenuAction(const LLSD& param) setSavePosesButtonText(!mPoserAnimator.allBaseRotationsAreZero(avatar)); } -bool FSFloaterPoser::notDoubleClicked() -{ - auto timeIntervalSinceLastExecution = std::chrono::system_clock::now() - mTimeLastExecutedDoubleClickMethod; - mTimeLastExecutedDoubleClickMethod = std::chrono::system_clock::now(); - - return timeIntervalSinceLastExecution > mDoubleClickInterval; -} - void FSFloaterPoser::onClickLoadLeftHandPose() { - if (notDoubleClicked()) - return; - onClickLoadHandPose(false); } void FSFloaterPoser::onClickLoadRightHandPose() { - if (notDoubleClicked()) - return; - onClickLoadHandPose(true); } @@ -1386,9 +1369,6 @@ void FSFloaterPoser::onUndoLastChange() void FSFloaterPoser::onSetAvatarToTpose() { - if (notDoubleClicked()) - return; - LLVOAvatar* avatar = getUiSelectedAvatar(); if (!avatar) return; @@ -1401,9 +1381,6 @@ void FSFloaterPoser::onSetAvatarToTpose() void FSFloaterPoser::onResetJoint(const LLSD data) { - if (notDoubleClicked()) - return; - int resetType = data.asInteger(); LLVOAvatar* avatar = getUiSelectedAvatar(); diff --git a/indra/newview/fsfloaterposer.h b/indra/newview/fsfloaterposer.h index 93788d57b3..bf4b9291eb 100644 --- a/indra/newview/fsfloaterposer.h +++ b/indra/newview/fsfloaterposer.h @@ -348,12 +348,6 @@ public: /// The avatar to whom the list is relevant. void addBoldToScrollList(LLScrollListCtrl* list, LLVOAvatar* avatar); - /// - /// Determines if the user has run this method twice within mDoubleClickInterval. - /// - /// true if this method has executed since mDoubleClickInterval seconds ago, otherwise false. - bool notDoubleClicked(); - /// /// Gets whether the user wishes to reset the base-rotation to zero when they start editing a joint. /// @@ -432,17 +426,6 @@ public: /// std::string static vec3ToXYZString(const LLVector3& val); - /// - /// The time when the last click of a button was made. - /// Utilized for controls needing a 'double click do' function. - /// - std::chrono::system_clock::time_point mTimeLastExecutedDoubleClickMethod = std::chrono::system_clock::now(); - - /// - /// The constant time interval, in seconds, a user must execute the notDoubleClicked twice to successfully 'double-click' a button. - /// - std::chrono::duration const mDoubleClickInterval = std::chrono::duration(0.3); - /// /// Unwraps a normalized value from the trackball to a slider value. /// 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 2cca78dc29..77592445a6 100644 --- a/indra/newview/skins/default/xui/en/floater_fs_poser.xml +++ b/indra/newview/skins/default/xui/en/floater_fs_poser.xml @@ -646,7 +646,7 @@ width="430"> layout="topleft" label="Set Left" name="button_loadHandPoseLeft" - tool_tip="Double click to set your left hand to the selected preset" + tool_tip="Click to set your left hand to the selected preset" top_delta="238" left_pad="1" left="2" @@ -660,7 +660,7 @@ width="430"> layout="topleft" label="Set Right" name="button_loadHandPoseRight" - tool_tip="Double click to set your right hand to the selected preset" + tool_tip="Click to set your right hand to the selected preset" left_pad="2" top_delta="0" width="85" > @@ -828,7 +828,7 @@ width="430"> label="Set to T-Pose" image_unselected="Toolbar_Middle_Off" name="set_t_pose_button" - tool_tip="Double-click to set the selected avatar to a 'T-Pose'" + tool_tip="Click to set the selected avatar to a 'T-Pose'" width="172"> @@ -1123,15 +1123,15 @@ width="430"> + width="53"> @@ -1167,15 +1167,15 @@ width="430"> + width="53"> @@ -1211,15 +1211,15 @@ width="430"> + width="53"> @@ -1404,7 +1404,7 @@ width="430"> image_overlay="Inv_TrashOpen" image_unselected="Toolbar_Middle_Off" name="poser_joint_reset" - tool_tip="Double click to reset the selected body part(s) to when you first started posing" + tool_tip="Click to reset the selected body part(s) to when you first started posing" width="18" top_delta="0" left_pad="1"> @@ -1472,7 +1472,7 @@ width="430"> layout="topleft" label="Copy L > R" name="button_symmetrize_left_to_right" - tool_tip="Double click to copy change from left side to right side." + tool_tip="Click to copy change from left side to right side." left="14" width="70" > layout="topleft" label="Copy R > L" name="button_symmetrize_right_to_left" - tool_tip="Double click to copy change from right side to left side." + tool_tip="Click to copy change from right side to left side." left_pad="23" top_delta="0" width="70" >