diff options
| author | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2020-11-13 17:51:41 +0000 |
|---|---|---|
| committer | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2020-11-13 17:51:41 +0000 |
| commit | 1416c4d5c20f90f40093bd6b5a2b41414eaee54d (patch) | |
| tree | e3ce6fcbbff3d6e56ea51c330bbc7a783af31042 /indra | |
| parent | 0bba892bb0b146a2c20597d8cfe6eb0353c17f06 (diff) | |
Merged in marchcat/SL-13161 (pull request #375)
SL-13161 Leftover change
* SL-13161 Leftover change
Approved-by: Andrey Kleshchev
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloatereditenvironmentbase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; |