From 54d632fc2b224cd4c1e1b4f270e0189aac3cd322 Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Tue, 20 Apr 2010 14:45:15 +0300 Subject: fixed major EXT-6905 Inventory offer from another resident appears like notification from object; Fixed regression introduced by rev. 050ab9232a5a, provided passing payload parameter "give_inventory_notification" to notification. reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/273/ --HG-- branch : product-engine --- indra/newview/llviewermessage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llviewermessage.cpp') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 360c6be2c6..930568f904 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1799,7 +1799,7 @@ void inventory_offer_handler(LLOfferInfo* info) payload["give_inventory_notification"] = TRUE; LLNotification::Params params(p.name); params.substitutions = p.substitutions; - params.payload = p.payload; + params.payload = payload; LLPostponedNotification::add( params, info->mFromID, false); } } -- cgit v1.2.3 From 47699b744cf99ae9f39530dc9a08455b0d92e0f0 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Tue, 20 Apr 2010 18:27:32 +0100 Subject: Checker: NULL_RETURNS Function: LLViewerInventoryMoveFromWorldObserver::onAssetAdded(const LLUUID &) File: /indra/newview/llviewermessage.cpp --- indra/newview/llviewermessage.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/newview/llviewermessage.cpp') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index c8a4b27f40..06f24d92d6 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -794,7 +794,10 @@ private: // Store selected items (without destination folder) mSelectedItems.clear(); - mActivePanel->getRootFolder()->getSelectionList(mSelectedItems); + if (mActivePanel) + { + mActivePanel->getRootFolder()->getSelectionList(mSelectedItems); + } mSelectedItems.erase(mMoveIntoFolderID); } -- cgit v1.2.3