From b6eabbc4e3b99a07ef5d8cdd3594a97de8ff5ad3 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Mon, 29 Jul 2019 17:44:39 +0300 Subject: SL-11660 Empty names should not be allowed --- indra/newview/llfloatereditextdaycycle.cpp | 10 +++++++++- 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); -- cgit v1.2.3