diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-07-29 08:06:38 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-07-29 08:06:38 -0700 |
| commit | b7eabcc7d721a53f4deaf10c3d6b8c8af5ab67b4 (patch) | |
| tree | e90888e53727d8b680bf820d15646067b5b0387c /indra | |
| parent | 491057a89c7e21e3b3e02bc8f804ac553f9023b6 (diff) | |
| parent | b6eabbc4e3b99a07ef5d8cdd3594a97de8ff5ad3 (diff) | |
Merge
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloatereditextdaycycle.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/llfloaterfixedenvironment.cpp | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp index 233c78d072..0fb7fee8cb 100644 --- a/indra/newview/llfloatereditextdaycycle.cpp +++ b/indra/newview/llfloatereditextdaycycle.cpp @@ -699,7 +699,15 @@ void LLFloaterEditExtDayCycle::onSaveAsCommit(const LLSD& notification, const LL if (0 == option) { std::string settings_name = response["message"].asString(); - LLStringUtil::trim(settings_name); + + LLInventoryObject::correctInventoryName(settings_name); + if (settings_name.empty()) + { + // Ideally notification should disable 'OK' button if name won't fit our requirements, + // for now either display notification, or use some default name + settings_name = "Unnamed"; + } + if (mCanMod) { doApplyCreateNewInventory(day, settings_name); diff --git a/indra/newview/llfloaterfixedenvironment.cpp b/indra/newview/llfloaterfixedenvironment.cpp index b1fdc2d2a5..05da640258 100644 --- a/indra/newview/llfloaterfixedenvironment.cpp +++ b/indra/newview/llfloaterfixedenvironment.cpp @@ -474,7 +474,15 @@ void LLFloaterFixedEnvironment::onSaveAsCommit(const LLSD& notification, const L if (0 == option) { std::string settings_name = response["message"].asString(); - LLStringUtil::trim(settings_name); + + LLInventoryObject::correctInventoryName(settings_name); + if (settings_name.empty()) + { + // Ideally notification should disable 'OK' button if name won't fit our requirements, + // for now either display notification, or use some default name + settings_name = "Unnamed"; + } + if (mCanMod) { doApplyCreateNewInventory(settings_name, settings); |