1 files changed, 21 insertions, 9 deletions

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index c5190fe486..d9596164eb 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -131,10 +131,10 @@
 #include "stringize.h"
 #include "llcoros.h"
 #include "llexception.h"
-#if LL_DARWIN || LL_LINUX || __FreeBSD__
+#if !_M_ARM64 // !LL_LINUX
 #include "cef/dullahan_version.h"
-#endif
 #include "vlc/libvlc_version.h"
+#endif // LL_LINUX
 
 #if LL_DARWIN
 #if LL_SDL
@@ -255,6 +255,9 @@ using namespace LL;
 #include "llviewereventrecorder.h"
 
 #include <chrono>
+#include "rlvactions.h"
+#include "rlvcommon.h"
+#include "rlvhandler.h"
 
 // *FIX: These extern globals should be cleaned up.
 // The globals either represent state/config/resource-storage of either
@@ -485,7 +488,7 @@ static void deferred_ui_audio_callback(const LLUUID& uuid)
 
 bool    create_text_segment_icon_from_url_match(LLUrlMatch* match,LLTextBase* base)
 {
-    if(!match || !base || base->getPlainText())
+    if (!match || match->getSkipProfileIcon() || !base || base->getPlainText())
         return false;
 
     LLUUID match_id = match->getID();
@@ -984,7 +987,7 @@ bool LLAppViewer::init()
         return false;
     }
 
-#if defined(__i386__) || defined(__x86_64__) || defined(__amd64__)
+#if defined(__i386__) || defined(__x86_64__) || defined(__amd64__) || _M_X64
     // Without SSE2 support we will crash almost immediately, warn here.
     if (!gSysCPU.hasSSE2())
     {
@@ -1541,7 +1544,11 @@ bool LLAppViewer::doFrame()
 
             if(fpsLimitSleepFor)
             {
+#if LL_WINDOWS
+                std::this_thread::sleep_for(std::chrono::microseconds(fpsLimitSleepFor));
+#else
                 usleep(fpsLimitSleepFor);
+#endif
             }
 
             // yield some time to the os based on command line option
@@ -1710,6 +1717,9 @@ bool LLAppViewer::cleanup()
     //ditch LLVOAvatarSelf instance
     gAgentAvatarp = NULL;
 
+    // Sanity check to catch cases where someone forgot to do an RlvActions::isRlvEnabled() check
+    LL_ERRS_IF(!RlvHandler::isEnabled() && RlvHandler::instanceExists()) << "RLV handler instance exists even though RLVa is disabled" << LL_ENDL;
+
     LLNotifications::instance().clear();
 
     // workaround for DEV-35406 crash on shutdown
@@ -3371,6 +3381,7 @@ LLSD LLAppViewer::getViewerInfo() const
     }
 #endif
 
+    info["RLV_VERSION"] = RlvActions::isRlvEnabled() ? Rlv::Strings::getVersionAbout() : "(disabled)";
     info["OPENGL_VERSION"] = ll_safe_string((const char*)(glGetString(GL_VERSION)));
 
     // Settings
@@ -3416,7 +3427,7 @@ LLSD LLAppViewer::getViewerInfo() const
         info["VOICE_VERSION"] = LLTrans::getString("NotConnected");
     }
 
-#if LL_DARWIN || LL_LINUX || __FreeBSD__
+#if !_M_ARM64 // !LL_LINUX
     std::ostringstream cef_ver_codec;
     cef_ver_codec << "Dullahan: ";
     cef_ver_codec << DULLAHAN_VERSION_MAJOR;
@@ -3446,7 +3457,7 @@ LLSD LLAppViewer::getViewerInfo() const
     info["LIBCEF_VERSION"] = "Undefined";
 #endif
 
-//#if !LL_LINUX
+#if !_M_ARM64 // !LL_LINUX
     std::ostringstream vlc_ver_codec;
     vlc_ver_codec << LIBVLC_VERSION_MAJOR;
     vlc_ver_codec << ".";
@@ -3454,11 +3465,9 @@ LLSD LLAppViewer::getViewerInfo() const
     vlc_ver_codec << ".";
     vlc_ver_codec << LIBVLC_VERSION_REVISION;
     info["LIBVLC_VERSION"] = vlc_ver_codec.str();
-/*
 #else
     info["LIBVLC_VERSION"] = "Undefined";
 #endif
-*/
 
     S32 packets_in = (S32)LLViewerStats::instance().getRecording().getSum(LLStatViewer::PACKETS_IN);
     if (packets_in > 0)
@@ -4293,7 +4302,7 @@ U32 LLAppViewer::getTextureCacheVersion()
 U32 LLAppViewer::getDiskCacheVersion()
 {
     // Viewer disk cache version intorduced in Simple Cache Viewer, change if the cache format changes.
-    const U32 DISK_CACHE_VERSION = 2;
+    const U32 DISK_CACHE_VERSION = 3;
 
     return DISK_CACHE_VERSION ;
 }
@@ -4585,6 +4594,7 @@ void LLAppViewer::saveFinalSnapshot()
                                     false,
                                     gSavedSettings.getBOOL("RenderHUDInSnapshot"),
                                     true,
+                                    false,
                                     LLSnapshotModel::SNAPSHOT_TYPE_COLOR,
                                     LLSnapshotModel::SNAPSHOT_FORMAT_PNG);
         mSavedFinalSnapshot = true;
@@ -5299,6 +5309,8 @@ void LLAppViewer::sendLogoutRequest()
         msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
         gAgent.sendReliableMessage();
 
+        LL_INFOS("Agent") << "Logging out as agent: " << gAgent.getID() << " Session: " << gAgent.getSessionID() << LL_ENDL;
+
         gLogoutTimer.reset();
         gLogoutMaxTime = LOGOUT_REQUEST_TIME;
         mLogoutRequestSent = true;