diff options
| author | Lynx Linden <lynx@lindenlab.com> | 2009-11-09 19:28:14 +0000 |
|---|---|---|
| committer | Lynx Linden <lynx@lindenlab.com> | 2009-11-09 19:28:14 +0000 |
| commit | a9b16734a1690551cc6277dc419dcb8629f4ddd1 (patch) | |
| tree | a2bd035c45264cbdf1adaa446e7a5670a790bcbe /indra/newview/llavataractions.h | |
| parent | 90d985946ce167a313e2765728caf2652931dfdd (diff) | |
DEV-41317 DEV-41318: Enabled the Call button in the Profile panel.
I've added a new LLAvatarActions::startCall() method to make it easy
to start a new P2P call. The Resident Profile "Call" button is now
hooked up to this.
I've also put back the "Call" menu in the avatar popup menu and hooked
this up too. While I was there I noticed that the "IM" popup menu code
could all be removed in favor of a call to LLAvatarActions::startIM().
Diffstat (limited to 'indra/newview/llavataractions.h')
| -rw-r--r-- | indra/newview/llavataractions.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llavataractions.h b/indra/newview/llavataractions.h index 512f673b43..0ec20ae357 100644 --- a/indra/newview/llavataractions.h +++ b/indra/newview/llavataractions.h @@ -67,6 +67,11 @@ public: static void startIM(const LLUUID& id); /** + * Start an avatar-to-avatar voice call with another user + */ + static void startCall(const LLUUID& id); + + /** * Start conference chat with the given avatars. */ static void startConference(const std::vector<LLUUID>& ids); @@ -97,6 +102,11 @@ public: static bool isBlocked(const LLUUID& id); /** + * Return true if the avatar is in a P2P voice call with a given user + */ + static bool isCalling(const LLUUID &id); + + /** * Invite avatar to a group. */ static void inviteToGroup(const LLUUID& id); |