Merged in viewer 2 changes, adjusted xui problems, added mesh folder type and more mesh inventory type info

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);