summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreference.cpp
diff options
context:
space:
mode:
authorJonathan Yap <jhwelch@gmail.com>2014-11-30 11:24:22 -0500
committerJonathan Yap <jhwelch@gmail.com>2014-11-30 11:24:22 -0500
commit563e22e81c6bf14bca6370b098a257f94f4f843f (patch)
tree4835333aa4dadfbc1ce37224ed40f6b2a12bc56b /indra/newview/llfloaterpreference.cpp
parent34a79a6ece28fbc560bde907142ecaadf95e910f (diff)
STORM-2082 Make code more generic to handle the future camera presets.
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
-rwxr-xr-xindra/newview/llfloaterpreference.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 6b798f6549..508d82522e 100755
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -749,7 +749,9 @@ void LLFloaterPreference::onOpen(const LLSD& key)
{
LL_WARNS() << "No " << default_file << " found -- creating one" << LL_ENDL;
// Write current graphic settings to default.xml
- LLPresetsManager::getInstance()->savePreset("Default");
+ // If this name is to be localized additional code will be needed to delete the old default
+ // when changing languages.
+ LLPresetsManager::getInstance()->savePreset(PRESETS_GRAPHIC, "Default");
}
}
@@ -2160,7 +2162,7 @@ void LLPanelPreferenceGraphics::setPresetNamesInComboBox()
{
LLComboBox* combo = getChild<LLComboBox>("graphic_preset_combo");
- LLPresetsManager::getInstance()->setPresetNamesInComboBox(combo);
+ LLPresetsManager::getInstance()->setPresetNamesInComboBox(PRESETS_GRAPHIC, combo);
}
void LLPanelPreferenceGraphics::draw()