diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-01-15 17:01:16 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-01-15 17:01:16 -0500 |
| commit | 9848fc42534e48d20cf6d6732aae1c8233580792 (patch) | |
| tree | cdc30035e2b6ced3cf6d4f9df1844ea7dc4c2836 /indra/newview/llassetuploadresponders.cpp | |
| parent | 4b7ff25eba4b285e267ec6f766221ffcde82a808 (diff) | |
| parent | 5a5c023e291990a463b1a91846ce82c70da8daab (diff) | |
merge changes for 4.0.1-release
Diffstat (limited to 'indra/newview/llassetuploadresponders.cpp')
| -rwxr-xr-x | indra/newview/llassetuploadresponders.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp index d2b1dcbf35..121ce647a6 100755 --- a/indra/newview/llassetuploadresponders.cpp +++ b/indra/newview/llassetuploadresponders.cpp @@ -618,7 +618,10 @@ void LLUpdateTaskInventoryResponder::uploadComplete(const LLSD& content) case LLAssetType::AT_NOTECARD: { // Update the UI with the new asset. - LLPreviewNotecard* nc = LLFloaterReg::findTypedInstance<LLPreviewNotecard>("preview_notecard", LLSD(item_id)); + LLSD floater_key; + floater_key["taskid"] = task_id; + floater_key["itemid"] = item_id; + LLPreviewNotecard* nc = LLFloaterReg::findTypedInstance<LLPreviewNotecard>("preview_notecard", floater_key); if(nc) { // *HACK: we have to delete the asset in the VFS so |