Update RLVa to 1.4.0-compatible

2012-01-25 21:11:33 +01:00
parent d385de9139
commit 7fec659979
31 changed files with 1637 additions and 322 deletions
--- a/indra/newview/llimpanel.h
+++ b/indra/newview/llimpanel.h
@@ -279,6 +279,17 @@ public:

 	static bool onConfirmForceCloseError(const LLSD& notification, const LLSD& response);

+	typedef enum e_session_type
+	{
+		P2P_SESSION,
+		GROUP_SESSION,
+		ADHOC_SESSION
+	} SType;
+	bool isP2PSessionType() const { return mSessionType == P2P_SESSION;}
+	bool isAdHocSessionType() const { return mSessionType == ADHOC_SESSION;}
+	bool isGroupSessionType() const { return mSessionType == GROUP_SESSION;}
+	SType mSessionType;
+
 private:
 	// called by constructors
 	void init(const std::string& session_label);