summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreference.cpp
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2020-01-08 18:18:16 +0200
committerMnikolenko Productengine <mnikolenko@productengine.com>2020-01-08 18:18:16 +0200
commit6d4bf056192dfed3acd6f6ab2894fab0072909a1 (patch)
tree70dd91de95b0b5712705342e4443cfddc543643d /indra/newview/llfloaterpreference.cpp
parenta2f0fd64e947f96305200edbdfd496529cadb90e (diff)
SL-12509 FIXED The Load, Save, and Delete preset floaters aren't opened together in the graphics preferences
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
-rw-r--r--indra/newview/llfloaterpreference.cpp15
1 files changed, 3 insertions, 12 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 2324c08855..da6f332cab 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -2678,26 +2678,17 @@ void LLPanelPreference::updateMediaAutoPlayCheckbox(LLUICtrl* ctrl)
void LLPanelPreference::deletePreset(const LLSD& user_data)
{
- std::string subdirectory = user_data.asString();
- LLFloaterReg::hideInstance("load_pref_preset", subdirectory);
- LLFloaterReg::hideInstance("save_pref_preset", subdirectory);
- LLFloaterReg::showInstance("delete_pref_preset", subdirectory);
+ LLFloaterReg::showInstance("delete_pref_preset", user_data.asString());
}
void LLPanelPreference::savePreset(const LLSD& user_data)
{
- std::string subdirectory = user_data.asString();
- LLFloaterReg::hideInstance("delete_pref_preset", subdirectory);
- LLFloaterReg::hideInstance("load_pref_preset", subdirectory);
- LLFloaterReg::showInstance("save_pref_preset", subdirectory);
+ LLFloaterReg::showInstance("save_pref_preset", user_data.asString());
}
void LLPanelPreference::loadPreset(const LLSD& user_data)
{
- std::string subdirectory = user_data.asString();
- LLFloaterReg::hideInstance("delete_pref_preset", subdirectory);
- LLFloaterReg::hideInstance("save_pref_preset", subdirectory);
- LLFloaterReg::showInstance("load_pref_preset", subdirectory);
+ LLFloaterReg::showInstance("load_pref_preset", user_data.asString());
}
void LLPanelPreference::setHardwareDefaults()