summaryrefslogtreecommitdiff
path: root/indra/newview/llavataractions.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-07-21 15:02:03 -0400
committerOz Linden <oz@lindenlab.com>2011-07-21 15:02:03 -0400
commitc118ec209907618c77613990fe2359d4f92802e6 (patch)
treeb2fa95d1fa1563cdee89d2bf035b680c64918c0f /indra/newview/llavataractions.h
parent54bb91fd03d0c2f2600993274c59ae89324eeb03 (diff)
parent67e365ba57bb7024a64bc0663782cd7f06b4a5cc (diff)
merge up changes for 2.8.0 release
Diffstat (limited to 'indra/newview/llavataractions.h')
-rw-r--r--indra/newview/llavataractions.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llavataractions.h b/indra/newview/llavataractions.h
index 956fed7461..fbfd815f41 100644
--- a/indra/newview/llavataractions.h
+++ b/indra/newview/llavataractions.h
@@ -36,6 +36,7 @@
class LLInventoryPanel;
+
/**
* Friend-related actions (add, remove, offer teleport, etc)
*/
@@ -196,6 +197,8 @@ public:
*/
static bool canShareSelectedItems(LLInventoryPanel* inv_panel = NULL);
+ static std::set<LLUUID> getInventorySelectedUUIDs();
+
private:
static bool callbackAddFriendWithMessage(const LLSD& notification, const LLSD& response);
static bool handleRemove(const LLSD& notification, const LLSD& response);