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

Remove FSButtonFlashRate in favor of FlashPeriod setting, sync the rate with our old value

meow-7.2.2
Cinders 2013-07-13 16:42:15 -06:00
parent 0ba8c30dcc
commit f28a984666
3 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/llui/lltabcontainer.cpp
View File

@ -1160,7 +1160,7 @@ void LLTabContainer::addTabPanel(const TabPanelParams& panel)
// <FS:Ansariel> Enable tab flashing
p.button_flash_enable(LLUI::sSettingGroups["config"]->getBOOL("EnableButtonFlashing"));
p.button_flash_count(LLUI::sSettingGroups["config"]->getS32("FlashCount"));
p.button_flash_rate(LLUI::sSettingGroups["config"]->getF32("FSButtonFlashRate"));
p.button_flash_rate(LLUI::sSettingGroups["config"]->getF32("FlashPeriod"));
// </FS:Ansariel>
// *TODO : It seems wrong not to use p in both cases considering the way p is initialized
@ -1903,7 +1903,7 @@ void LLTabContainer::initButtons()
// <FS:Ansariel> Enable tab flashing
prev_btn_params.button_flash_enable(LLUI::sSettingGroups["config"]->getBOOL("EnableButtonFlashing"));
prev_btn_params.button_flash_count(LLUI::sSettingGroups["config"]->getS32("FlashCount"));
prev_btn_params.button_flash_rate(LLUI::sSettingGroups["config"]->getF32("FSButtonFlashRate"));
prev_btn_params.button_flash_rate(LLUI::sSettingGroups["config"]->getF32("FlashPeriod"));
// </FS:Ansariel>
mPrevArrowBtn = LLUICtrlFactory::create<LLButton>(prev_btn_params);
@ -1919,7 +1919,7 @@ void LLTabContainer::initButtons()
// <FS:Ansariel> Enable tab flashing
next_btn_params.button_flash_enable(LLUI::sSettingGroups["config"]->getBOOL("EnableButtonFlashing"));
next_btn_params.button_flash_count(LLUI::sSettingGroups["config"]->getS32("FlashCount"));
next_btn_params.button_flash_rate(LLUI::sSettingGroups["config"]->getF32("FSButtonFlashRate"));
next_btn_params.button_flash_rate(LLUI::sSettingGroups["config"]->getF32("FlashPeriod"));
// </FS:Ansariel>
mNextArrowBtn = LLUICtrlFactory::create<LLButton>(next_btn_params);
@ -1962,7 +1962,7 @@ void LLTabContainer::initButtons()
// <FS:Ansariel> Enable tab flashing
p.button_flash_enable(LLUI::sSettingGroups["config"]->getBOOL("EnableButtonFlashing"));
p.button_flash_count(LLUI::sSettingGroups["config"]->getS32("FlashCount"));
p.button_flash_rate(LLUI::sSettingGroups["config"]->getF32("FSButtonFlashRate"));
p.button_flash_rate(LLUI::sSettingGroups["config"]->getF32("FlashPeriod"));
// </FS:Ansariel>
mJumpPrevArrowBtn = LLUICtrlFactory::create<LLButton>(p);
@ -1979,7 +1979,7 @@ void LLTabContainer::initButtons()
// <FS:Ansariel> Enable tab flashing
p.button_flash_enable(LLUI::sSettingGroups["config"]->getBOOL("EnableButtonFlashing"));
p.button_flash_count(LLUI::sSettingGroups["config"]->getS32("FlashCount"));
p.button_flash_rate(LLUI::sSettingGroups["config"]->getF32("FSButtonFlashRate"));
p.button_flash_rate(LLUI::sSettingGroups["config"]->getF32("FlashPeriod"));
// </FS:Ansariel>
mPrevArrowBtn = LLUICtrlFactory::create<LLButton>(p);
@ -1995,7 +1995,7 @@ void LLTabContainer::initButtons()
// <FS:Ansariel> Enable tab flashing
p.button_flash_enable(LLUI::sSettingGroups["config"]->getBOOL("EnableButtonFlashing"));
p.button_flash_count(LLUI::sSettingGroups["config"]->getS32("FlashCount"));
p.button_flash_rate(LLUI::sSettingGroups["config"]->getF32("FSButtonFlashRate"));
p.button_flash_rate(LLUI::sSettingGroups["config"]->getF32("FlashPeriod"));
// </FS:Ansariel>
mJumpNextArrowBtn = LLUICtrlFactory::create<LLButton>(p);
@ -2012,7 +2012,7 @@ void LLTabContainer::initButtons()
// <FS:Ansariel> Enable tab flashing
p.button_flash_enable(LLUI::sSettingGroups["config"]->getBOOL("EnableButtonFlashing"));
p.button_flash_count(LLUI::sSettingGroups["config"]->getS32("FlashCount"));
p.button_flash_rate(LLUI::sSettingGroups["config"]->getF32("FSButtonFlashRate"));
p.button_flash_rate(LLUI::sSettingGroups["config"]->getF32("FlashPeriod"));
// </FS:Ansariel>
mNextArrowBtn = LLUICtrlFactory::create<LLButton>(p);

15
indra/newview/app_settings/settings.xml
View File

@ -12711,7 +12711,7 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
<integer>0</integer>
</map>
<key>ShowMiniLocationPanel</key>
<map>
@ -16340,7 +16340,7 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>0.5</real>
<real>1.25</real>
</map>
<key>WindLightUseAtmosShaders</key>
<map>
@ -18849,17 +18849,6 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>0</integer>
</map>
<key>FSButtonFlashRate</key>
<map>
<key>Comment</key>
<string>Frequency at which buttons flash (hz)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>1.25</real>
</map>
<key>FSTagShowDistanceColors</key>
<map>
<key>Comment</key>

2
indra/newview/skins/default/xui/en/panel_preferences_UI.xml
View File

@ -433,7 +433,7 @@
top_pad="6"
width="471" />
<slider
control_name="FSButtonFlashRate"
control_name="FlashPeriod"
decimal_digits="0"
follows="left|top"
height="16"