diff options
author | Alexei Arabadji <aarabadji@productengine.com> | 2010-04-20 14:47:17 +0300 |
---|---|---|
committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-04-20 14:47:17 +0300 |
commit | 3c45631cbc4b1f26143f05e9a58f0349679e663a (patch) | |
tree | 8ff028e5517cbab37ae36f9e588b655e1e8ea917 /indra/newview | |
parent | f260d52c75ee9b0d3c6fc1b081b6ae0d19641f9e (diff) | |
parent | 54d632fc2b224cd4c1e1b4f270e0189aac3cd322 (diff) |
Automated merge with https://hg.productengine.com/secondlife/viewer-trunk/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/llviewermessage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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<LLPostponedOfferNotification>( params, info->mFromID, false); } } |