aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llassetuploadresponders.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-10-17 20:50:10 -0700
committerMcCabe Maxsted2009-10-17 20:50:10 -0700
commita056eb1973d6f547b689e05a617016e7f0532941 (patch)
treee3422af39a886e6444b23a2ee107d4e773ec93b8 /linden/indra/newview/llassetuploadresponders.cpp
parentFix muting objects with same name as avatar mutes ScriptDialogs from avatar. (diff)
downloadmeta-impy-a056eb1973d6f547b689e05a617016e7f0532941.zip
meta-impy-a056eb1973d6f547b689e05a617016e7f0532941.tar.gz
meta-impy-a056eb1973d6f547b689e05a617016e7f0532941.tar.bz2
meta-impy-a056eb1973d6f547b689e05a617016e7f0532941.tar.xz
Ported notecard security fix from LL's 1.23.5 viewer
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llassetuploadresponders.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llassetuploadresponders.cpp b/linden/indra/newview/llassetuploadresponders.cpp
index be3882e..311ff64 100644
--- a/linden/indra/newview/llassetuploadresponders.cpp
+++ b/linden/indra/newview/llassetuploadresponders.cpp
@@ -440,7 +440,6 @@ void LLUpdateTaskInventoryResponder::uploadComplete(const LLSD& content)
440 { 440 {
441 case LLAssetType::AT_NOTECARD: 441 case LLAssetType::AT_NOTECARD:
442 { 442 {
443
444 // Update the UI with the new asset. 443 // Update the UI with the new asset.
445 LLPreviewNotecard* nc; 444 LLPreviewNotecard* nc;
446 nc = (LLPreviewNotecard*)LLPreview::find(item_id); 445 nc = (LLPreviewNotecard*)LLPreview::find(item_id);
@@ -459,6 +458,7 @@ void LLUpdateTaskInventoryResponder::uploadComplete(const LLSD& content)
459 LLAssetType::AT_NOTECARD); 458 LLAssetType::AT_NOTECARD);
460 } 459 }
461 460
461 nc->setAssetId(content["new_asset"].asUUID());
462 nc->refreshFromInventory(); 462 nc->refreshFromInventory();
463 } 463 }
464 } 464 }