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

Clean up formatting in floater_fs_poser.xml and fix various issues that showed up in log

meow-7.2.2
Ansariel 2024-11-05 17:14:13 +01:00
parent 28186b59a0
commit 01197be897
4 changed files with 1063 additions and 1095 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/fsfloaterposer.cpp
View File

@ -180,7 +180,6 @@ bool FSFloaterPoser::postBuild()
mAdvScaleYSlider = getChild<LLSliderCtrl>("Advanced_Scale_Y");
mAdvScaleZSlider = getChild<LLSliderCtrl>("Advanced_Scale_Z");
mSaveFilePptionsPnl = getChild<LLPanel>("save_file_options");
mPosesLoadSavePnl = getChild<LLPanel>("poses_loadSave");
mStartStopPosingBtn = getChild<LLButton>("start_stop_posing_button");
mToggleLoadSavePanelBtn = getChild<LLButton>("toggleLoadSavePanel");
@ -212,10 +211,6 @@ bool FSFloaterPoser::postBuild()
mMiscJointsPnl = getChild<LLPanel>("misc_joints_panel");
mCollisionVolumesPnl = getChild<LLPanel>("collision_volumes_panel");
mStopPosingWhenClosed = getChild<LLCheckBoxCtrl>("stop_posing_on_close_checkbox");
if (gSavedSettings.getBOOL(POSER_STOPPOSINGWHENCLOSED_SAVE_KEY))
mStopPosingWhenClosed->set(true);
return true;
}
@ -236,9 +231,6 @@ void FSFloaterPoser::onClose(bool app_quitting)
if (mToggleAdvancedPanelBtn)
gSavedSettings.setBOOL(POSER_ADVANCEDWINDOWSTATE_SAVE_KEY, mToggleAdvancedPanelBtn->getValue().asBoolean());
if (mStopPosingWhenClosed)
gSavedSettings.setBOOL(POSER_STOPPOSINGWHENCLOSED_SAVE_KEY, mStopPosingWhenClosed->getValue());
if (gSavedSettings.getBOOL(POSER_STOPPOSINGWHENCLOSED_SAVE_KEY))
stopPosingSelf();
@ -1054,16 +1046,6 @@ void FSFloaterPoser::onToggleLoadSavePanel()
if (loadSavePanelExpanded)
refreshPoseScroll(mPosesScrollList);
showOrHideAdvancedSaveOptions();
}
void FSFloaterPoser::showOrHideAdvancedSaveOptions()
{
bool loadSavePanelExpanded = mToggleLoadSavePanelBtn->getValue().asBoolean();
bool advancedPanelExpanded = mToggleAdvancedPanelBtn->getValue().asBoolean();
mSaveFilePptionsPnl->setVisible(loadSavePanelExpanded && advancedPanelExpanded);
}
void FSFloaterPoser::onToggleMirrorChange()
@ -1364,7 +1346,6 @@ void FSFloaterPoser::onToggleAdvancedPanel()
return;
reshape(poserFloaterWidth, poserFloaterHeight);
showOrHideAdvancedSaveOptions();
onJointSelect();
}

3
indra/newview/fsfloaterposer.h
View File

@ -205,7 +205,6 @@ class FSFloaterPoser : public LLFloater
bool poseFileStartsFromTeePose(const std::string& poseFileName);
void setPoseSaveFileTextBoxToUiSelectedAvatarSaveFileName();
void setUiSelectedAvatarSaveFileName(const std::string& saveFileName);
void showOrHideAdvancedSaveOptions();
// UI Event Handlers:
void onAvatarsRefresh();
@ -385,7 +384,6 @@ class FSFloaterPoser : public LLFloater
LLButton* mSetToTposeButton{ nullptr };
LLButton* mRecaptureJointsButton{ nullptr };
LLCheckBoxCtrl* mStopPosingWhenClosed{ nullptr };
LLLineEditor* mPoseSaveNameEditor{ nullptr };
LLPanel* mAdvancedParentPnl{ nullptr };
@ -397,7 +395,6 @@ class FSFloaterPoser : public LLFloater
LLPanel* mHandsJointsPnl{ nullptr };
LLPanel* mMiscJointsPnl{ nullptr };
LLPanel* mCollisionVolumesPnl{ nullptr };
LLPanel* mSaveFilePptionsPnl{ nullptr };
LLPanel* mPosesLoadSavePnl{ nullptr };
};

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

File diff suppressed because it is too large Load Diff

1
indra/newview/skins/default/xui/en/widgets/fs_virtual_trackpad.xml
View File

@ -4,7 +4,6 @@
width="150"
height="150"
pinch_mode="false"
user_resize="false"
image_sphere="VirtualTrackball_Sphere"
image_moon_back="VirtualTrackball_Moon_Back"
image_moon_front="VirtualTrackball_Moon_Front"