Skip to content
Snippets Groups Projects
Commit 2b2579cf authored by angela@angelas-macbook-pro.local's avatar angela@angelas-macbook-pro.local
Browse files

EXT-1645 [BSI] Selection Beam color preference (My Effects) isn't...

  EXT-1645  [BSI] Selection Beam color preference (My Effects) isn't remembered after re-log  EXT-1644 [BSI] Selection Beam color preference (My Effects) doesn't honor color choice -- reviewed by richard
parent 2128d0c9
No related branches found
No related tags found
No related merge requests found
File mode changed from 100644 to 100755
...@@ -602,8 +602,8 @@ void LLFloaterPreference::onBtnOK() ...@@ -602,8 +602,8 @@ void LLFloaterPreference::onBtnOK()
apply(); apply();
closeFloater(false); closeFloater(false);
gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile"), TRUE );
LLUIColorTable::instance().saveUserSettings(); LLUIColorTable::instance().saveUserSettings();
gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile"), TRUE );
std::string crash_settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE); std::string crash_settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE);
// save all settings, even if equals defaults // save all settings, even if equals defaults
gCrashSettings.saveToFile(crash_settings_filename, FALSE); gCrashSettings.saveToFile(crash_settings_filename, FALSE);
......
...@@ -260,7 +260,7 @@ ...@@ -260,7 +260,7 @@
width="200"> width="200">
My effects: My effects:
</text> </text>
<text <text
type="string" type="string"
length="1" length="1"
follows="left|top" follows="left|top"
...@@ -270,16 +270,23 @@ ...@@ -270,16 +270,23 @@
name="title_afk_text" name="title_afk_text"
width="190"> width="190">
Away timeout: Away timeout:
</text> </text>
<color_swatch <color_swatch
control_name="EffectColor" can_apply_immediately="true"
follows="left|top" follows="left|top"
height="50" height="50"
layout="topleft" layout="topleft"
left="50" left="50"
name="effect_color_swatch" name="effect_color_swatch"
tool_tip="Click to open Color Picker" tool_tip="Click to open Color Picker"
width="38" /> width="38">
<color_swatch.init_callback
function="Pref.getUIColor"
parameter="EffectColor" />
<color_swatch.commit_callback
function="Pref.applyUIColor"
parameter="EffectColor" />
</color_swatch>
<combo_box <combo_box
height="23" height="23"
layout="topleft" layout="topleft"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment