diff options
| author | Adam Moss <moss@lindenlab.com> | 2008-12-02 20:35:40 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2008-12-02 20:35:40 +0000 |
| commit | fd46865a502036b9e4414e7ec4950faf551b1f14 (patch) | |
| tree | 634dbca07e829d3906ed555341118c361aa1bb14 /indra/newview/llimpanel.cpp | |
| parent | de7d6cf4dfa1db2945e3ed4a3e8257d72674a496 (diff) | |
QAR-1040 maint-viewer-11 + OpenAL combo mergeme
svn merge -c104451
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/openal-maint-viewer-11-combo-r104448
Diffstat (limited to 'indra/newview/llimpanel.cpp')
| -rw-r--r-- | indra/newview/llimpanel.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp index 9538efdc37..51b0470e07 100644 --- a/indra/newview/llimpanel.cpp +++ b/indra/newview/llimpanel.cpp @@ -1644,9 +1644,7 @@ BOOL LLFloaterIMPanel::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, accepted = true; if(drop) { - LLToolDragAndDrop::giveInventory(mOtherParticipantUUID, inv_item); - LLStringUtil::format_map_t args; - gIMMgr->addSystemMessage(mSessionUUID, "inventory_item_offered", args); + LLToolDragAndDrop::giveInventory(mOtherParticipantUUID, inv_item, mSessionUUID); } } } |