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/lltooldraganddrop.h | |
| 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/lltooldraganddrop.h')
| -rw-r--r-- | indra/newview/lltooldraganddrop.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/lltooldraganddrop.h b/indra/newview/lltooldraganddrop.h index f9e1d75754..627ef86c38 100644 --- a/indra/newview/lltooldraganddrop.h +++ b/indra/newview/lltooldraganddrop.h @@ -211,7 +211,8 @@ protected: // give inventory item functionality static void handleCopyProtectedItem(S32 option, void* data); static void commitGiveInventoryItem(const LLUUID& to_agent, - LLInventoryItem* item); + LLInventoryItem* item, + const LLUUID &im_session_id = LLUUID::null); // give inventory category functionality static void handleCopyProtectedCategory(S32 option, void* data); @@ -251,7 +252,9 @@ public: ESource source, const LLUUID& src_id); - static void giveInventory(const LLUUID& to_agent, LLInventoryItem* item); + static void giveInventory(const LLUUID& to_agent, + LLInventoryItem* item, + const LLUUID &session_id = LLUUID::null); static void giveInventoryCategory(const LLUUID& to_agent, LLInventoryCategory* item); }; |