diff options
author | coyot@coyot-sager-PC.hsd1.ca.comcast.net <coyot@coyot-sager-PC.hsd1.ca.comcast.net> | 2017-05-05 18:07:00 +0100 |
---|---|---|
committer | coyot@coyot-sager-PC.hsd1.ca.comcast.net <coyot@coyot-sager-PC.hsd1.ca.comcast.net> | 2017-05-05 18:07:00 +0100 |
commit | a1194ce6e9faaa259821611b51d4448fea49ddc1 (patch) | |
tree | 4d1c63b64ae44a2a1855d0e10f595495971a044d /indra/newview/llgiveinventory.h | |
parent | c15ffb40458184002ade41ff652fab3d9ffbb761 (diff) | |
parent | 322767f98e3c3164e3be03daa85580038ca6fb52 (diff) |
pull from gate
Diffstat (limited to 'indra/newview/llgiveinventory.h')
-rw-r--r-- | indra/newview/llgiveinventory.h | 4 |
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, |