Second Life viewer sources 1.18.5.0-RC

5 files changed, 23 insertions, 5 deletions

diff --git a/linden/indra/llcommon/llpreprocessor.h b/linden/indra/llcommon/llpreprocessor.h
index b3b79d0..459d086 100644
--- a/linden/indra/llcommon/llpreprocessor.h
+++ b/linden/indra/llcommon/llpreprocessor.h
@@ -124,6 +124,9 @@
 #if defined(LL_WINDOWS)
 #define BOOST_REGEX_NO_LIB 1
 #define CURL_STATICLIB 1
+
+#define LL_LCD_COMPILE 1
+
 #endif  //      LL_WINDOWS
 
 
diff --git a/linden/indra/llcommon/llstringtable.h b/linden/indra/llcommon/llstringtable.h
index b7412ef..f7206fe 100644
--- a/linden/indra/llcommon/llstringtable.h
+++ b/linden/indra/llcommon/llstringtable.h
@@ -47,8 +47,10 @@
 //# define STRING_TABLE_HASH_MAP 1
 #endif
 
-#if STRING_TABLE_HASH_MAP
+#if LL_WINDOWS
 #include <hash_map>
+#else
+#include <ext/hash_map>
 #endif
 
 const U32 MAX_STRINGS_LENGTH = 256;
@@ -99,7 +101,11 @@ public:
         S32 mUniqueEntries;
         
 #if STRING_TABLE_HASH_MAP
+#if LL_WINDOWS
         typedef std::hash_multimap<U32, LLStringTableEntry *> string_hash_t;
+#else
+        typedef __gnu_cxx::hash_multimap<U32, LLStringTableEntry *> string_hash_t;
+#endif
         string_hash_t mStringHash;
 #else
         typedef std::list<LLStringTableEntry *> string_list_t;
diff --git a/linden/indra/llcommon/llversionserver.h b/linden/indra/llcommon/llversionserver.h
index 8891b47..e36702a 100644
--- a/linden/indra/llcommon/llversionserver.h
+++ b/linden/indra/llcommon/llversionserver.h
@@ -34,8 +34,8 @@
 
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 18;
-const S32 LL_VERSION_PATCH = 4;
-const S32 LL_VERSION_BUILD = 0;
+const S32 LL_VERSION_PATCH = 3;
+const S32 LL_VERSION_BUILD = 73552;
 
 const char * const LL_CHANNEL = "Second Life Server";
 
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index 71b7347..8d87e13 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -34,8 +34,8 @@
 
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 18;
-const S32 LL_VERSION_PATCH = 4;
-const S32 LL_VERSION_BUILD = 3;
+const S32 LL_VERSION_PATCH = 5;
+const S32 LL_VERSION_BUILD = 0;
 
 const char * const LL_CHANNEL = "Second Life Release";
 
diff --git a/linden/indra/llcommon/roles_constants.h b/linden/indra/llcommon/roles_constants.h
index 54e6827..1a7c977 100644
--- a/linden/indra/llcommon/roles_constants.h
+++ b/linden/indra/llcommon/roles_constants.h
@@ -142,11 +142,17 @@ const U64 GP_NOTICES_RECEIVE		= 0x1LL << 43;	// Receive Notices and View Notice
 const U64 GP_PROPOSAL_START             = 0x1LL << 44;  // Start Proposal
 const U64 GP_PROPOSAL_VOTE              = 0x1LL << 45;  // Vote on Proposal
 
+const U64 GP_SESSION_JOIN = 0x1LL << 46; //can join session
+const U64 GP_SESSION_VOICE = 0x1LL << 47; //can hear/talk
+const U64 GP_SESSION_MODERATOR = 0x1LL << 49; //can mute people's session
+
 const U64 GP_DEFAULT_MEMBER = GP_ACCOUNTING_ACCOUNTABLE
                                                                 | GP_LAND_ALLOW_SET_HOME
                                                                 | GP_NOTICES_RECEIVE
                                                                 | GP_PROPOSAL_START
                                                                 | GP_PROPOSAL_VOTE
+                                                                | GP_SESSION_JOIN
+                                                                | GP_SESSION_VOICE
                                                                 ;
 
 const U64 GP_DEFAULT_OFFICER = GP_ACCOUNTING_ACCOUNTABLE
@@ -187,5 +193,8 @@ const U64 GP_DEFAULT_OFFICER = GP_ACCOUNTING_ACCOUNTABLE
                                                                 | GP_PROPOSAL_VOTE
                                                                 | GP_ROLE_ASSIGN_MEMBER_LIMITED
                                                                 | GP_ROLE_PROPERTIES
+                                                                | GP_SESSION_MODERATOR
+                                                                | GP_SESSION_JOIN
+                                                                | GP_SESSION_VOICE
                                                                 ;
 #endif