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

FIRE-30873: Remove zoom button

meow-7.2.2
Angeldark Raymaker 2024-10-19 22:52:43 +01:00
parent 6836b2e8c0
commit c72ce7773c
3 changed files with 3 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
indra/newview/fsfloaterposer.cpp
View File

@ -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<LLButton>(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<LLButton>(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<LLButton>(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;

5
indra/newview/fsfloaterposer.h
View File

@ -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.
/// </summary>
const F32 normalTrackpadRangeInRads = F_PI;
/// <summary>
/// When the trackpad is placed in 'high' sensitivity mode, changes are moderated by this factor.
/// </summary>
const F32 trackPadHighSensitivity = 0.5;
/// <summary>
/// Refreshes the pose load/save list.

28
indra/newview/skins/default/xui/en/floater_poser.xml
View File

@ -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"/>
<panel
@ -704,28 +704,6 @@ width="565">
<button.commit_callback
function="Poser.PoseJointsReset"/>
</button>
<button
follows="left|top"
height="21"
is_toggle="true"
layout="topleft"
label=""
image_overlay="Command_Search_Icon"
image_hover_unselected="Toolbar_Middle_Over"
image_selected="Toolbar_Middle_Selected"
image_unselected="Toolbar_Middle_Off"
button_flash_enable="true"
flash_color="0.7 0.7 1 1"
button_flash_count="64"
button_flash_rate="0.5"
name="button_toggleTrackPadSensitivity"
tool_tip="Make smaller changes when using the trackball."
left_pad="1"
top_delta="0"
width="18" >
<button.commit_callback
function="Poser.ToggleTrackPadSensitivity"/>
</button>
<button
follows="left|top"
height="21"
@ -743,7 +721,7 @@ width="565">
tool_tip="Change the opposite joint, like in a mirror."
left_pad="1"
top_delta="0"
width="38" >
width="47" >
<button.commit_callback
function="Poser.ToggleMirrorChanges"/>
</button>
@ -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" >
<button.commit_callback
function="Poser.ToggleSympatheticChanges"/>
</button>