1 files changed, 51 insertions, 3 deletions

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index dcba891f9f..d7f6852c38 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -70,6 +70,7 @@
 #include "llmeshrepository.h"
 #include "llmutelist.h"
 #include "llmoveview.h"
+#include "llnotificationmanager.h"
 #include "llnotificationsutil.h"
 #include "llphysicsshapebuilderutil.h"
 #include "llquantize.h"
@@ -817,6 +818,20 @@ LLVOAvatar::~LLVOAvatar()
 {
     sInstances.remove(this);
 
+    static LLCachedControl<bool> show_arrival_departures(gSavedSettings, "IMShowArrivalsDepartures", false);
+    if (show_arrival_departures)
+    {
+        auto full_name = getFullname();
+        if (!full_name.empty())
+        {
+            LLChat chat{llformat("%s left.", full_name.c_str())};
+            chat.mFromName = full_name;
+            chat.mFromID = getID();
+            LLSD args;
+            args["COLOR"] = "ChatHistoryTextColor";
+            LLNotificationsUI::LLNotificationManager::instance().onChat(chat, args);
+        }
+    }
     if (!mFullyLoaded)
     {
         debugAvatarRezTime("AvatarRezLeftCloudNotification","left after ruth seconds as cloud");
@@ -1175,7 +1190,7 @@ void LLVOAvatar::initClass()
 
     LLControlAvatar::sRegionChangedSlot = gAgent.addRegionChangedCallback(&LLControlAvatar::onRegionChanged);
 
-    sCloudTexture = LLViewerTextureManager::getFetchedTextureFromFile("cloud-particle.j2c");
+    sCloudTexture = LLViewerTextureManager::getFetchedTextureFromFile("cloud-particle.png");
 }
 
 
@@ -2567,6 +2582,23 @@ U32 LLVOAvatar::processUpdateMessage(LLMessageSystem *mesgsys,
     {
         mDebugExistenceTimer.reset();
         debugAvatarRezTime("AvatarRezArrivedNotification", "avatar arrived");
+        static LLCachedControl<bool> show_arrival_departures(gSavedSettings, "IMShowArrivalsDepartures", false);
+        if (show_arrival_departures)
+        {
+            auto full_name = getFullname();
+            if (!full_name.empty())
+            {
+                auto avatarsPositions = gAgent.getAvatarsPositions();
+                auto id = getID();
+                auto avatarPosition = avatarsPositions[id];
+                LLChat chat{std::string{full_name + " arrived" + (avatarPosition.isExactlyZero() ? "" : llformat(" (%.1f m)", dist_vec(avatarPosition, gAgent.getPositionGlobal()))) + "."}};
+                chat.mFromName = full_name;
+                chat.mFromID = id;
+                LLSD args;
+                args["COLOR"] = "ChatHistoryTextColor";
+                LLNotificationsUI::LLNotificationManager::instance().onChat(chat, args);
+            }
+        }
     }
 
     if (retval & LLViewerObject::INVALID_UPDATE)
@@ -8895,6 +8927,7 @@ void LLVOAvatar::updateMeshTextures()
         bool is_ltda = layerset
             && layerset->getViewerComposite()->isInitialized()
             && layerset->isLocalTextureDataAvailable();
+#ifndef __aarch64__
         mBakedTextureDebugText += llformat("%4d   %4s     %4d %4d %4d %4d %4s\n",
                                            i,
                                            (layerset?"*":"0"),
@@ -8903,6 +8936,7 @@ void LLVOAvatar::updateMeshTextures()
                                            is_layer_baked[i],
                                            use_lkg_baked_layer[i],
                                            last_id_string.c_str());
+#endif
     }
 
     for (U32 i=0; i < mBakedTextureDatas.size(); i++)
@@ -11738,24 +11772,38 @@ void LLVOAvatar::placeProfileQuery()
         glGenQueries(1, &mGPUTimerQuery);
     }
 
-    glBeginQuery(GL_TIME_ELAPSED, mGPUTimerQuery);
+#if GL_EXT_timer_query || GL_EXT_disjoint_timer_query
+    glBeginQuery(GL_TIME_ELAPSED_EXT, mGPUTimerQuery);
+#endif
 }
 
 void LLVOAvatar::readProfileQuery(S32 retries)
 {
     if (!mGPUProfilePending)
     {
-        glEndQuery(GL_TIME_ELAPSED);
+#if GL_EXT_timer_query || GL_EXT_disjoint_timer_query
+        glEndQuery(GL_TIME_ELAPSED_EXT);
+#endif
         mGPUProfilePending = true;
     }
 
+#if GL_ARB_timer_query
     GLuint64 result = 0;
     glGetQueryObjectui64v(mGPUTimerQuery, GL_QUERY_RESULT_AVAILABLE, &result);
+#else
+    GLuint result = 0;
+    glGetQueryObjectuiv(mGPUTimerQuery, GL_QUERY_RESULT_AVAILABLE, &result);
+#endif
 
     if (result == GL_TRUE || --retries <= 0)
     { // query available, readback result
+#if GL_ARB_timer_query
         GLuint64 time_elapsed = 0;
         glGetQueryObjectui64v(mGPUTimerQuery, GL_QUERY_RESULT, &time_elapsed);
+#else
+        GLuint time_elapsed = 0;
+        glGetQueryObjectuiv(mGPUTimerQuery, GL_QUERY_RESULT, &time_elapsed);
+#endif
         mGPURenderTime = time_elapsed / 1000000.f;
         mGPUProfilePending = false;