Merge from default branch

--HG--
branch : product-engine

1 files changed, 13 insertions, 0 deletions

diff --git a/indra/newview/llavataractions.h b/indra/newview/llavataractions.h
index 0ec20ae357..66ea6880db 100644
--- a/indra/newview/llavataractions.h
+++ b/indra/newview/llavataractions.h
@@ -33,6 +33,13 @@
 #ifndef LL_LLAVATARACTIONS_H
 #define LL_LLAVATARACTIONS_H
 
+#include "lldarray.h"
+#include "llsd.h"
+#include "lluuid.h"
+
+#include <string>
+#include <vector>
+
 /**
  * Friend-related actions (add, remove, offer teleport, etc)
  */
@@ -72,6 +79,11 @@ public:
 	static void startCall(const LLUUID& id);
 
 	/**
+	 * Start an ad-hoc conference voice call with multiple users
+	 */
+	static void startAdhocCall(const std::vector<LLUUID>& ids);
+
+	/**
 	 * Start conference chat with the given avatars.
 	 */
 	static void startConference(const std::vector<LLUUID>& ids);
@@ -117,6 +129,7 @@ private:
 	static bool handleRemove(const LLSD& notification, const LLSD& response);
 	static bool handlePay(const LLSD& notification, const LLSD& response, LLUUID avatar_id);
 	static void callback_invite_to_group(LLUUID group_id, LLUUID id);
+	static void callbackAutoStartCall(const LLSD& data);
 
 	// Just request friendship, no dialog.
 	static void requestFriendship(const LLUUID& target_id, const std::string& target_name, const std::string& message);