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

FIRE-17630: Properly disable per-account settings backup list in preferences

master
Ansariel 2016-01-10 20:01:55 +01:00
parent d726428d46
commit b071a8cd7c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llfloaterpreference.cpp
View File

@ -1029,6 +1029,9 @@ void LLFloaterPreference::onOpen(const LLSD& key)
gSavedPerAccountSettings.getControl("FSMutedAvatarResponse")->getSignal()->connect(boost::bind(&LLFloaterPreference::onDoNotDisturbResponseChanged, this));
gSavedPerAccountSettings.getControl("FSAwayAvatarResponse")->getSignal()->connect(boost::bind(&LLFloaterPreference::onDoNotDisturbResponseChanged, this));
// </FS:Ansariel>
// <FS:Ansariel> FIRE-17630: Properly disable per-account settings backup list
getChildView("restore_per_account_disable_cover")->setVisible(FALSE);
}
gAgent.sendAgentUserInfoRequest();

4
indra/newview/skins/default/xui/en/panel_preferences_backup.xml
View File

@ -180,7 +180,6 @@ Settings groups to be restored (backup will always save all):
right="-1"
height="180"
draw_heading="true"
enabled_control="PerAccountSettingsFile"
multi_select="false">
<column label="" name="restore_per_account_files_check" width="16" />
<column label="Per Account Files:" name="restore_per_account_files_label" />
@ -249,8 +248,7 @@ Settings groups to be restored (backup will always save all):
left="0"
top="0"
right="-1"
height="180"
invisibility_control="PerAccountSettingsFile" />
height="180"/>
</layout_panel>