Merge RLVa

.gitattributes

+*          text=auto
+
+# Sources
+*.cpp      text diff=cpp
+*.h        text diff=cpp
+*.py       text diff=python
+
+# Documents
+*.txt      text
+*.xml      text
+
+# Graphics
+*.png      binary diff=exif
+*.jpg      binary diff=exif
+*.jpeg     binary diff=exif
+*.gif      binary diff=exif
+*.tif      binary
+*.tiff     binary
+*.ico      binary
+*.svg      text
+*.eps      binary
+
+# Scripts
+*.sh       text eol=lf
+*.bat      text eol=crlf
+
+# Exclude files from exporting
+.gitattributes export-ignore
+.gitignore     export-ignore

.gitignore

@@ -69,4 +69,4 @@ libraries
 tarfile_tmp
 web/config.*
 web/locale.*
-web/secondlife.com.*
\ No newline at end of file
+web/secondlife.com.*

autobuild.xml

@@ -758,9 +758,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>93257fce19120c01751362775a01b925</string>
+              <string>cba1feed7f6bb671d791a517fddf205a</string>
               <key>url</key>
-              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/1545/3481/fmodex-4.44.64.501533-darwin64-501533.tar.bz2</string>
+              <string>https://downloads.catznip.com/packages/fmodex-44461-darwin-201601300040-r23.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -794,9 +794,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>601c2fc41a18812a45678ef9a87ef772</string>
+              <string>2038da4ab71da8dc086738007c0acdd3</string>
               <key>url</key>
-              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/1546/3486/fmodex-4.44.64.501533-windows-501533.tar.bz2</string>
+              <string>http://viewer.catznip.com/downloads/packages/fmodex-4.44.61-windows-171261212.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -806,9 +806,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>e5cde35ae26ebfa256cfe670986e152e</string>
+              <string>b4b73cd64bfd72e7ae84aad429d69cf6</string>
               <key>url</key>
-              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/1547/3487/fmodex-4.44.64.501533-windows64-501533.tar.bz2</string>
+              <string>http://viewer.catznip.com/downloads/packages/fmodex-4.44.61-windows64-171261211.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
@@ -2706,9 +2706,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>8a7f0be5647e07235d205ac00805fb78</string>
+              <string>545954e46a316e469f6b68ecbcb76573</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1116/2586/openjpeg-1.5.1.501102-windows-501102.tar.bz2</string>
+              <string>http://viewer.catznip.com/downloads/packages/openjpeg-1.5.2.171271050-windows-171271050.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -2718,9 +2718,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>398544058036bc27097fcff208934d11</string>
+              <string>a68103651741c8b66356153ee5668d6b</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1115/2581/openjpeg-1.5.1.501102-windows64-501102.tar.bz2</string>
+              <string>http://viewer.catznip.com/downloads/packages/openjpeg-1.5.2.171271046-windows64-171271046.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>

indra/cmake/FMODEX.cmake

@@ -26,9 +26,15 @@ if (FMODEX)
       include(Prebuilt)
       use_prebuilt_binary(fmodex)    
       if (WINDOWS)
-        set(FMODEX_LIBRARY 
-            debug fmodexL_vc
-            optimized fmodex_vc)
+        if (ADDRESS_SIZE EQUAL 32)
+            set(FMODEX_LIBRARY
+                debug fmodexL_vc
+                optimized fmodex_vc)
+        else (ADDRESS_SIZE EQUAL 64)
+            set(FMODEX_LIBRARY
+                debug fmodexL64_vc
+                optimized fmodex64_vc)
+        endif (ADDRESS_SIZE EQUAL 32)
       elseif (DARWIN)
         set(FMODEX_LIBRARY 
             debug fmodexL

indra/cmake/Python.cmake

@@ -5,21 +5,30 @@ set(PYTHONINTERP_FOUND)
 if (WINDOWS)
   # On Windows, explicitly avoid Cygwin Python.
 
-  find_program(PYTHON_EXECUTABLE
-    NAMES python25.exe python23.exe python.exe
-    NO_DEFAULT_PATH # added so that cmake does not find cygwin python
-    PATHS
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]
-    [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]
-    [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
-    [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
-    [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
-    [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]
-    )
+  if (DEFINED ENV{VIRTUAL_ENV})
+    find_program(PYTHON_EXECUTABLE
+      NAMES python.exe
+      PATHS
+      "$ENV{VIRTUAL_ENV}\\scripts"
+      NO_DEFAULT_PATH
+      )
+  else()
+    find_program(PYTHON_EXECUTABLE
+      NAMES python25.exe python23.exe python.exe
+      NO_DEFAULT_PATH # added so that cmake does not find cygwin python
+      PATHS
+      [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]
+      [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
+      [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
+      [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
+      [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]
+      [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]
+      [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
+      [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
+      [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
+      [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]
+      )
+  endif()
 elseif (EXISTS /etc/debian_version)
   # On Debian and Ubuntu, avoid Python 2.4 if possible.
 

indra/integration_tests/llui_libtest/llui_libtest.cpp

@@ -52,6 +52,17 @@ LLControlGroup gSavedSettings("Global");	// saved at end of session
 LLControlGroup gSavedPerAccountSettings("PerAccount"); // saved at end of session
 LLControlGroup gWarningSettings("Warnings"); // persists ignored dialogs/warnings
 
+// [RLVa:KB] - Checked: 2010-11-12 (RLVa-1.2.2a) | Added: RLVa-1.2.2a
+#include "llavatarname.h"
+
+// Stub for rlvGetAnonym
+const std::string& rlvGetAnonym(const LLAvatarName& avName)
+{
+	static std::string strAnonym = "A resident";
+	return strAnonym;
+}
+// [/RLVa:KB]
+
 // We can't create LLImageGL objects because we have no window or rendering 
 // context.  Provide enough of an LLUIImage to test the LLUI library without
 // an underlying image.

indra/llappearance/llwearabledata.cpp

@@ -103,7 +103,15 @@ void LLWearableData::pushWearable(const LLWearableType::EType type,
 	}
 	if (canAddWearable(type))
 	{
-		mWearableDatas[type].push_back(wearable);
+// [RLVa:KB] - Checked: 2010-06-08 (RLVa-1.2.0)
+		// Don't add the same wearable twice
+		U32 idxWearable = 0;
+		if (!getWearableIndex(wearable, idxWearable))
+			mWearableDatas[type].push_back(wearable);
+		else
+			llassert(false); // pushWearable() on an already added wearable is a bug *somewhere*
+// [/RLVa:KB]
+//		mWearableDatas[type].push_back(wearable);		mWearableDatas[type].push_back(wearable);
 		if (trigger_updated)
 		{
 			const BOOL removed = FALSE;
@@ -150,16 +158,16 @@ void LLWearableData::eraseWearable(const LLWearableType::EType type, U32 index)
 	}
 }
 
-void LLWearableData::clearWearableType(const LLWearableType::EType type)
-{
-	wearableentry_map_t::iterator wearable_iter = mWearableDatas.find(type);
-	if (wearable_iter == mWearableDatas.end())
-	{
-		return;
-	}
-	wearableentry_vec_t& wearable_vec = wearable_iter->second;
-	wearable_vec.clear();
-}
+//void LLWearableData::clearWearableType(const LLWearableType::EType type)
+//{
+//	wearableentry_map_t::iterator wearable_iter = mWearableDatas.find(type);
+//	if (wearable_iter == mWearableDatas.end())
+//	{
+//		return;
+//	}
+//	wearableentry_vec_t& wearable_vec = wearable_iter->second;
+//	wearable_vec.clear();
+//}
 
 bool LLWearableData::swapWearables(const LLWearableType::EType type, U32 index_a, U32 index_b)
 {

indra/llappearance/llwearabledata.h

@@ -79,7 +79,7 @@ class LLWearableData
 	virtual void	wearableUpdated(LLWearable *wearable, BOOL removed);
 	void 			eraseWearable(LLWearable *wearable);
 	void			eraseWearable(const LLWearableType::EType type, U32 index);
-	void			clearWearableType(const LLWearableType::EType type);
+//	void			clearWearableType(const LLWearableType::EType type);
 	bool			swapWearables(const LLWearableType::EType type, U32 index_a, U32 index_b);
 
 private:

indra/llappearance/llwearabletype.cpp

@@ -60,6 +60,12 @@ class LLWearableDictionary : public LLSingleton<LLWearableDictionary>,
 							 public LLDictionary<LLWearableType::EType, WearableEntry>
 {
 	LLSINGLETON(LLWearableDictionary);
+
+// [RLVa:KB] - Checked: 2010-03-03 (RLVa-1.2.0a) | Added: RLVa-1.2.0a
+protected:
+	// The default implementation asserts on 'notFound()' and returns -1 which isn't a valid EWearableType
+	virtual LLWearableType::EType notFound() const { return LLWearableType::WT_INVALID; }
+// [/RLVa:KB]
 };
 
 LLWearableDictionary::LLWearableDictionary()
@@ -87,7 +93,10 @@ LLWearableDictionary::LLWearableDictionary()
 	addEntry(LLWearableType::WT_TATTOO,       new WearableEntry("tattoo",      "New Tattoo",		LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_TATTOO, FALSE, TRUE));
 	addEntry(LLWearableType::WT_UNIVERSAL,    new WearableEntry("universal",   "New Universal",     LLAssetType::AT_CLOTHING,   LLInventoryType::ICONNAME_CLOTHING_UNIVERSAL, FALSE, TRUE));
 
-	addEntry(LLWearableType::WT_PHYSICS,      new WearableEntry("physics",     "New Physics",		LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_PHYSICS, TRUE, TRUE));
+// [SL:KB] - Patch: Appearance-Misc | Checked: 2011-05-29 (Catznip-2.6)
+	addEntry(LLWearableType::WT_PHYSICS,      new WearableEntry("physics",     "New Physics",		LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_PHYSICS, TRUE, FALSE));
+// [/SL:KB]
+//	addEntry(LLWearableType::WT_PHYSICS,      new WearableEntry("physics",     "New Physics",		LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_PHYSICS, TRUE, TRUE));
 
 	addEntry(LLWearableType::WT_INVALID,      new WearableEntry("invalid",     "Invalid Wearable", 	LLAssetType::AT_NONE, 		LLInventoryType::ICONNAME_UNKNOWN, FALSE, FALSE));
 	addEntry(LLWearableType::WT_NONE,      	  new WearableEntry("none",        "Invalid Wearable", 	LLAssetType::AT_NONE, 		LLInventoryType::ICONNAME_NONE, FALSE, FALSE));

indra/llcommon/llstring.cpp

@@ -577,6 +577,78 @@ std::string utf8str_truncate(const std::string& utf8str, const S32 max_len)
 	}
 }
 
+// [RLVa:KB] - Checked: RLVa-2.1.0
+std::string utf8str_substr(const std::string& utf8str, const S32 index, const S32 max_len)
+{
+	if (0 == max_len)
+	{
+		return std::string();
+	}
+	if (utf8str.length() - index  <= max_len)
+	{
+		return utf8str.substr(index, max_len);
+	}
+	else
+	{
+		S32 cur_char = max_len;
+
+		// If we're ASCII, we don't need to do anything
+		if ((U8)utf8str[index + cur_char] > 0x7f)
+		{
+			// If first two bits are (10), it's the tail end of a multibyte char.  We need to shift back
+			// to the first character
+			while (0x80 == (0xc0 & utf8str[index + cur_char]))
+			{
+				cur_char--;
+				// Keep moving forward until we hit the first char;
+				if (cur_char == 0)
+				{
+					// Make sure we don't trash memory if we've got a bogus string.
+					break;
+				}
+			}
+		}
+		// The byte index we're on is one we want to get rid of, so we only want to copy up to (cur_char-1) chars
+		return utf8str.substr(index, cur_char);
+	}
+}
+
+void utf8str_split(std::list<std::string>& split_list, const std::string& utf8str, size_t maxlen, char split_token)
+{
+	split_list.clear();
+
+	std::string::size_type lenMsg = utf8str.length(), lenIt = 0;
+
+	const char* pstrIt = utf8str.c_str(); std::string strTemp;
+	while (lenIt < lenMsg)
+	{
+		if (lenIt + maxlen < lenMsg)
+		{
+			// Find the last split character
+			const char* pstrTemp = pstrIt + maxlen;
+			while ( (pstrTemp > pstrIt) && (*pstrTemp != split_token) )
+				pstrTemp--;
+
+			if (pstrTemp > pstrIt)
+				strTemp = utf8str.substr(lenIt, pstrTemp - pstrIt);
+			else
+				strTemp = utf8str_substr(utf8str, lenIt, maxlen);
+		}
+		else
+		{
+			strTemp = utf8str.substr(lenIt, std::string::npos);
+		}
+
+		split_list.push_back(strTemp);
+
+		lenIt += strTemp.length();
+		pstrIt = utf8str.c_str() + lenIt;
+		if (*pstrIt == split_token)
+			lenIt++;
+	}
+}
+// [/RLVa:KB]
+
 std::string utf8str_symbol_truncate(const std::string& utf8str, const S32 symbol_len)
 {
     if (0 == symbol_len)

indra/llcommon/llstring.h

@@ -36,6 +36,9 @@
 #include <vector>
 #include <map>
 #include "llformat.h"
+// [RLVa:KB] - Checked: RLVa-2.1.0
+#include <list>
+// [/RLVa:KB]
 
 #if LL_LINUX || LL_SOLARIS
 #include <wctype.h>
@@ -664,6 +667,11 @@ LL_COMMON_API S32 wstring_wstring_length_from_utf16_length(const LLWString & wst
  */
 LL_COMMON_API std::string utf8str_truncate(const std::string& utf8str, const S32 max_len);
 
+// [RLVa:KB] - Checked: RLVa-2.1.0
+LL_COMMON_API std::string utf8str_substr(const std::string& utf8str, const S32 index, const S32 max_len);
+LL_COMMON_API void utf8str_split(std::list<std::string>& split_list, const std::string& utf8str, size_t maxlen, char split_token);
+// [/RLVa:KB]
+
 LL_COMMON_API std::string utf8str_trim(const std::string& utf8str);
 
 LL_COMMON_API S32 utf8str_compare_insensitive(

indra/llimage/llimagejpeg.cpp

@@ -386,7 +386,7 @@ boolean LLImageJPEG::encodeEmptyOutputBuffer( j_compress_ptr cinfo )
   {
     self->setLastError("Out of memory in LLImageJPEG::encodeEmptyOutputBuffer( j_compress_ptr cinfo )");
     LLTHROW(LLContinueError("Out of memory in LLImageJPEG::encodeEmptyOutputBuffer( j_compress_ptr cinfo )"));
-  	return false;
+//  	return false;
   }
   memcpy( new_buffer, self->mOutputBuffer, self->mOutputBufferSize );	/* Flawfinder: ignore */
   delete[] self->mOutputBuffer;

indra/llmath/v4color.cpp

@@ -59,6 +59,9 @@ LLColor4 LLColor4::grey1(0.8f, 0.8f, 0.8f, 1.0f);
 LLColor4 LLColor4::grey2(0.6f, 0.6f, 0.6f, 1.0f);
 LLColor4 LLColor4::grey3(0.4f, 0.4f, 0.4f, 1.0f);
 LLColor4 LLColor4::grey4(0.3f, 0.3f, 0.3f, 1.0f);
+// [RLVa:KB] - Checked: RLVa-2.2 (@setcam_avdist)
+LLColor4 LLColor4::silhouette(0.05f, 0.05f, 0.05f, 1.0f);
+// [/RLVa:KB]
 
 LLColor4 LLColor4::red1(1.0f, 0.0f, 0.0f, 1.0f);
 LLColor4 LLColor4::red2(0.6f, 0.0f, 0.0f, 1.0f);

indra/llmath/v4color.h

@@ -154,6 +154,9 @@ class LLColor4
 		static LLColor4 grey2;
 		static LLColor4 grey3;
 		static LLColor4 grey4;
+// [RLVa:KB] - Checked: RLVa-2.2 (@setcam_avdist)
+		static LLColor4 silhouette;
+// [/RLVa:KB]
 
 		static LLColor4 red1;
 		static LLColor4 red2;

indra/llmessage/llavatarnamecache.cpp

@@ -49,7 +49,6 @@
 #include <map>
 #include <set>
 
-
 // Time-to-live for a temp cache entry.
 const F64 TEMP_CACHE_ENTRY_LIFETIME = 60.0;
 // Maximum time an unrefreshed cache entry is allowed.
@@ -680,10 +679,30 @@ LLAvatarNameCache::callback_connection_t LLAvatarNameCache::getNameCallback(cons
 	return connection;
 }
 
+// [RLVa:KB] - Checked: 2010-12-08 (RLVa-1.4.0a) | Added: RLVa-1.2.2c
+bool LLAvatarNameCache::getForceDisplayNames()
+{
+	return mRlvForceDisplayNames;
+}
+
+void LLAvatarNameCache::setForceDisplayNames(bool force)
+{
+	mRlvForceDisplayNames = force;
+	if ( (!LLAvatarName::useDisplayNames()) && (force) )
+	{
+		LLAvatarName::setUseDisplayNames(true);
+	}
+}
+// [/RLVa:KB]
 
 void LLAvatarNameCache::setUseDisplayNames(bool use)
 {
+// [RLVa:KB] - Checked: 2010-12-08 (RLVa-1.4.0a) | Added: RLVa-1.2.2c
+	// We need to force the use of the "display names" cache when @shownames=n restricted (and disallow toggling it)
+	use |= getForceDisplayNames();
+// [/RLVa:KB]
 	if (use != LLAvatarName::useDisplayNames())
+
 	{
 		LLAvatarName::setUseDisplayNames(use);
 		mUseDisplayNamesSignal();

indra/llmessage/llavatarnamecache.h

@@ -84,6 +84,12 @@ class LLAvatarNameCache : public LLSingleton<LLAvatarNameCache>
 	void setUseUsernames(bool use);
 
 	void insert(const LLUUID& agent_id, const LLAvatarName& av_name);
+
+// [RLVa:KB] - Checked: 2010-12-08 (RLVa-1.4.0a) | Added: RLVa-1.2.2c
+	bool getForceDisplayNames();
+	void setForceDisplayNames(bool force);
+// [/RLVa:KB]
+
 	void erase(const LLUUID& agent_id);
 
 	// A way to find agent id by UUID, very slow, also unreliable
@@ -150,6 +156,11 @@ class LLAvatarNameCache : public LLSingleton<LLAvatarNameCache>
     // For testing, there's a UsePeopleAPI setting that can be flipped (must restart viewer).
     bool mUsePeopleAPI;
 
+// [RLVa:KB] - Checked: 2010-12-08 (RLVa-1.4.0a) | Added: RLVa-1.2.2c
+    // RLVa override for display names
+    bool mRlvForceDisplayNames = false;
+// [/RLVa:KB]
+
     // Base lookup URL for name service.
     // On simulator, loaded from indra.xml
     // On viewer, usually a simulator capability (at People API team's request)

indra/llrender/llgltexture.cpp

@@ -316,7 +316,10 @@ BOOL LLGLTexture::getIsAlphaMask() const
 	return mGLTexturep->getIsAlphaMask() ;
 }
 
-BOOL LLGLTexture::getMask(const LLVector2 &tc)
+//BOOL LLGLTexture::getMask(const LLVector2 &tc)
+// [RLVa:KB] - Checked: RLVa-2.2 (@setoverlay)
+bool LLGLTexture::getMask(const LLVector2 &tc) const
+// [/RLVa:KB]
 {
 	llassert(mGLTexturep.notNull()) ;
 

indra/llrender/llgltexture.h

@@ -143,7 +143,10 @@ class LLGLTexture : public LLTexture
 	LLGLenum   getPrimaryFormat() const;
 	BOOL       getIsAlphaMask() const ;
 	LLTexUnit::eTextureType getTarget(void) const ;
-	BOOL       getMask(const LLVector2 &tc);
+// [RLVa:KB] - Checked: RLVa-2.2 (@setoverlay)
+	bool       getMask(const LLVector2 &tc) const;
+// [/RLVa:KB]
+//	BOOL       getMask(const LLVector2 &tc);
 	F32        getTimePassedSinceLastBound();
 	BOOL       getMissed() const ;
 	BOOL       isJustBound()const ;