diff --git a/indra/newview/fsfloaterposer.cpp b/indra/newview/fsfloaterposer.cpp index 7fc768690a..32dae91899 100644 --- a/indra/newview/fsfloaterposer.cpp +++ b/indra/newview/fsfloaterposer.cpp @@ -72,7 +72,6 @@ static const std::string POSER_TRACKPAD_SENSITIVITY_SLIDER_NAME = "trackpad_sens static const std::string POSER_AVATAR_SLIDER_YAW_NAME = "limb_yaw"; // turning your nose left or right static const std::string POSER_AVATAR_SLIDER_PITCH_NAME = "limb_pitch"; // pointing your nose up or down static const std::string POSER_AVATAR_SLIDER_ROLL_NAME = "limb_roll"; // your ear touches your shoulder -static const std::string POSER_AVATAR_TOGGLEBUTTON_TRACKPADSENSITIVITY = "button_toggleTrackPadSensitivity"; static const std::string POSER_AVATAR_TOGGLEBUTTON_MIRROR = "button_toggleMirrorRotation"; static const std::string POSER_AVATAR_TOGGLEBUTTON_SYMPATH = "button_toggleSympatheticRotation"; static const std::string POSER_AVATAR_BUTTON_REDO = "button_redo_change"; @@ -129,7 +128,6 @@ FSFloaterPoser::FSFloaterPoser(const LLSD& key) : LLFloater(key) mCommitCallbackRegistrar.add("Poser.RedoLastRotation", boost::bind(&FSFloaterPoser::onRedoLastRotation, this)); mCommitCallbackRegistrar.add("Poser.ToggleMirrorChanges", boost::bind(&FSFloaterPoser::onToggleMirrorChange, this)); mCommitCallbackRegistrar.add("Poser.ToggleSympatheticChanges", boost::bind(&FSFloaterPoser::onToggleSympatheticChange, this)); - mCommitCallbackRegistrar.add("Poser.ToggleTrackPadSensitivity", boost::bind(&FSFloaterPoser::refreshTrackpadCursor, this)); mCommitCallbackRegistrar.add("Poser.AdjustTrackPadSensitivity", boost::bind(&FSFloaterPoser::onAdjustTrackpadSensitivity, this)); mCommitCallbackRegistrar.add("Poser.PositionSet", boost::bind(&FSFloaterPoser::onAvatarPositionSet, this)); @@ -1564,17 +1562,6 @@ void FSFloaterPoser::onLimbTrackballChanged() pitch = trackPadPos.mV[VY]; roll = trackPadPos.mV[VZ]; - LLButton *toggleSensitivityButton = getChild(POSER_AVATAR_TOGGLEBUTTON_TRACKPADSENSITIVITY); - if (toggleSensitivityButton) - { - bool moreSensitive = toggleSensitivityButton->getValue().asBoolean(); - if (moreSensitive) - { - yaw *= trackPadHighSensitivity; - pitch *= trackPadHighSensitivity; - } - } - F32 trackPadSensitivity = llmax(gSavedSettings.getF32(POSER_TRACKPAD_SENSITIVITY_SAVE_KEY), 0.0001f); yaw *= trackPadSensitivity; pitch *= trackPadSensitivity; @@ -1648,16 +1635,6 @@ void FSFloaterPoser::onLimbYawPitchRollChanged() yaw /= normalTrackpadRangeInRads; pitch /= normalTrackpadRangeInRads; roll /= normalTrackpadRangeInRads; - LLButton *toggleSensitivityButton = getChild(POSER_AVATAR_TOGGLEBUTTON_TRACKPADSENSITIVITY); - if (toggleSensitivityButton) - { - bool moreSensitive = toggleSensitivityButton->getValue().asBoolean(); - if (moreSensitive) - { - yaw /= trackPadHighSensitivity; - pitch /= trackPadHighSensitivity; - } - } trackBall->setValue(yaw, pitch, roll); } @@ -1696,17 +1673,6 @@ void FSFloaterPoser::refreshTrackpadCursor() axis2 /= normalTrackpadRangeInRads; axis3 /= normalTrackpadRangeInRads; - LLButton *toggleSensitivityButton = getChild(POSER_AVATAR_TOGGLEBUTTON_TRACKPADSENSITIVITY); - if (toggleSensitivityButton) - { - bool moreSensitive = toggleSensitivityButton->getValue().asBoolean(); - if (moreSensitive) - { - axis1 /= trackPadHighSensitivity; - axis2 /= trackPadHighSensitivity; - } - } - F32 trackPadSensitivity = llmax(gSavedSettings.getF32(POSER_TRACKPAD_SENSITIVITY_SAVE_KEY), 0.0001f); axis1 /= trackPadSensitivity; axis2 /= trackPadSensitivity; diff --git a/indra/newview/fsfloaterposer.h b/indra/newview/fsfloaterposer.h index 583e022fd7..03ed72fe00 100644 --- a/indra/newview/fsfloaterposer.h +++ b/indra/newview/fsfloaterposer.h @@ -77,11 +77,6 @@ class FSFloaterPoser : public LLFloater /// The trackpad ordinarily has a range of +1..-1; multiplied by PI, gives PI to -PI, or all 360 degrees of deflection. /// const F32 normalTrackpadRangeInRads = F_PI; - - /// - /// When the trackpad is placed in 'high' sensitivity mode, changes are moderated by this factor. - /// - const F32 trackPadHighSensitivity = 0.5; /// /// Refreshes the pose load/save list. diff --git a/indra/newview/skins/default/xui/en/floater_poser.xml b/indra/newview/skins/default/xui/en/floater_poser.xml index 833a44144d..c8ae6a7c29 100644 --- a/indra/newview/skins/default/xui/en/floater_poser.xml +++ b/indra/newview/skins/default/xui/en/floater_poser.xml @@ -644,7 +644,7 @@ width="565"> top_delta="15" height="153" width="153" - tool_tip="Change the rotation of the currently selected body part(s). Roll the wheel while holding to adjust the 3rd axis" + tool_tip="Change the rotation of the currently selected body part(s). Hold Ctrl to move slow. Roll the wheel while holding to adjust the 3rd axis" pinch_mode="false" infinite_scroll_mode="true"/> - @@ -764,7 +742,7 @@ width="565"> tool_tip="Change the opposite joint, but in the same way." left_pad="1" top_delta="0" - width="38" > + width="47" >