diff options
author | Richard Linden <none@none> | 2011-07-07 13:34:13 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2011-07-07 13:34:13 -0700 |
commit | 88a90aabcb5bdede24bb451d443239e1e116c4ea (patch) | |
tree | 9399a4aefc1a9017986e1c29f9c9077d6e3c74c7 /indra/newview/llavataractions.h | |
parent | 66dcc72870b19c6ada65a643ca33c779c9c9989b (diff) | |
parent | 8f7579e4e46bb8da9fece3125ae31c3bb885be96 (diff) |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/llavataractions.h')
-rw-r--r-- | indra/newview/llavataractions.h | 3 |
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); |