From 1416c4d5c20f90f40093bd6b5a2b41414eaee54d Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Fri, 13 Nov 2020 17:51:41 +0000 Subject: Merged in marchcat/SL-13161 (pull request #375) SL-13161 Leftover change * SL-13161 Leftover change Approved-by: Andrey Kleshchev --- indra/newview/llfloatereditenvironmentbase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llfloatereditenvironmentbase.cpp b/indra/newview/llfloatereditenvironmentbase.cpp index 2a38f18b73..e888144b6a 100644 --- a/indra/newview/llfloatereditenvironmentbase.cpp +++ b/indra/newview/llfloatereditenvironmentbase.cpp @@ -197,7 +197,7 @@ void LLFloaterEditEnvironmentBase::onAssetLoaded(LLUUID asset_id, LLSettingsBase if (!settings || status) { LLSD args; - args["NAME"] = (mInventoryItem) ? mInventoryItem->getName() : "Unknown"; + args["NAME"] = (mInventoryItem) ? mInventoryItem->getName() : asset_id.asString(); LLNotificationsUtil::add("FailedToFindSettings", args); closeFloater(); return; -- cgit v1.2.3