summaryrefslogtreecommitdiff
path: root/indra/newview/llgiveinventory.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2017-04-19 16:02:48 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2017-04-19 16:02:48 -0400
commitde5cbddf7918c45c46a1c3a569bdb1adaf3dde06 (patch)
tree35a11fbfffc2d4e01d2f1f7450ea62614fc48919 /indra/newview/llgiveinventory.h
parent8d12ef71a0de00f7bb3ecce61b7fe3a84bda1b88 (diff)
parentf62b5503285d828813d87779fa0658ee5f122ac5 (diff)
merge
Diffstat (limited to 'indra/newview/llgiveinventory.h')
-rw-r--r--indra/newview/llgiveinventory.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llgiveinventory.h b/indra/newview/llgiveinventory.h
index 85bc1ed49c..20e6df76e5 100644
--- a/indra/newview/llgiveinventory.h
+++ b/indra/newview/llgiveinventory.h
@@ -78,7 +78,9 @@ private:
* logs "Inventory item offered" to IM
*/
static void logInventoryOffer(const LLUUID& to_agent,
- const LLUUID &im_session_id = LLUUID::null);
+ const LLUUID &im_session_id = LLUUID::null,
+ const std::string& item_name = std::string(),
+ bool is_folder = false);
static void commitGiveInventoryItem(const LLUUID& to_agent,
const LLInventoryItem* item,