summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterloadprefpreset.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-01-21 23:13:44 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-01-21 23:18:18 +0200
commitbdedaf58726dd1c2565766fddd5f3795586f4054 (patch)
treeefa5706e4e5b738ca969d67b5b4b85a6509743b9 /indra/newview/llfloaterloadprefpreset.cpp
parent5629062ce73603e725b4e805a24d807920cd3145 (diff)
SL-14728 Im session without id should be closable
Diffstat (limited to 'indra/newview/llfloaterloadprefpreset.cpp')
-rw-r--r--indra/newview/llfloaterloadprefpreset.cpp14
1 files changed, 11 insertions, 3 deletions
diff --git a/indra/newview/llfloaterloadprefpreset.cpp b/indra/newview/llfloaterloadprefpreset.cpp
index f89daf3e04..8ed76b1df4 100644
--- a/indra/newview/llfloaterloadprefpreset.cpp
+++ b/indra/newview/llfloaterloadprefpreset.cpp
@@ -58,9 +58,17 @@ BOOL LLFloaterLoadPrefPreset::postBuild()
void LLFloaterLoadPrefPreset::onOpen(const LLSD& key)
{
mSubdirectory = key.asString();
- std::string floater_title = getString(std::string("title_") + mSubdirectory);
-
- setTitle(floater_title);
+ std::string title_type = std::string("title_") + mSubdirectory;
+ if (hasString(title_type))
+ {
+ std::string floater_title = getString(title_type);
+ setTitle(floater_title);
+ }
+ else
+ {
+ LL_WARNS() << title_type << " not found" << LL_ENDL;
+ setTitle(title_type);
+ }
LLComboBox* combo = getChild<LLComboBox>("preset_combo");