Merge branch 'develop' of https://github.com/secondlife/viewer into callum/voice-moderation-2

4 files changed, 25 insertions, 6 deletions

diff --git a/indra/llui/llemojihelper.cpp b/indra/llui/llemojihelper.cpp
index b2c59ce775..7cdd19bebc 100644
--- a/indra/llui/llemojihelper.cpp
+++ b/indra/llui/llemojihelper.cpp
@@ -117,7 +117,17 @@ void LLEmojiHelper::showHelper(LLUICtrl* hostctrl_p, S32 local_x, S32 local_y, c
     S32 top = floater_y - HELPER_FLOATER_OFFSET_Y + rect.getHeight();
     rect.setLeftTopAndSize(left, top, rect.getWidth(), rect.getHeight());
     pHelperFloater->setRect(rect);
+
+    // Hack: Trying to open floater, search for a match,
+    // and hide floater immediately if no match found,
+    // instead of checking prior to opening
+    //
+    // Supress sounds in case floater won't be shown.
+    // Todo: add some kind of shouldShow(short_code)
+    U8 sound_flags = pHelperFloater->getSoundFlags();
+    pHelperFloater->setSoundFlags(LLView::SILENT);
     pHelperFloater->openFloater(LLSD().with("hint", short_code));
+    pHelperFloater->setSoundFlags(sound_flags);
 }
 
 void LLEmojiHelper::hideHelper(const LLUICtrl* ctrl_p, bool strict)
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index fd07b2ec5d..52a5e3dbd6 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -2274,7 +2274,7 @@ void LLFloater::drawConeToOwner(F32 &context_cone_opacity,
         LLRect local_rect = getLocalRect();
 
         gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
-        LLGLEnable(GL_CULL_FACE);
+        LLGLEnable cull_face(GL_CULL_FACE);
         gGL.begin(LLRender::TRIANGLE_STRIP);
         {
             gGL.color4f(0.f, 0.f, 0.f, contex_cone_in_alpha * context_cone_opacity);
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index 0f9fd35868..878f1cb856 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -1884,10 +1884,18 @@ void LLFolderViewFolder::updateHasFavorites(bool new_childs_value)
 void LLFolderViewFolder::onIdleUpdateFavorites(void* data)
 {
     LLFolderViewFolder* self = reinterpret_cast<LLFolderViewFolder*>(data);
+    if (self->mFavoritesDirtyFlags == FAVORITE_CLEANUP)
+    {
+        // parent or child already processed the update, clean the callback
+        self->mFavoritesDirtyFlags = 0;
+        gIdleCallbacks.deleteFunction(&LLFolderViewFolder::onIdleUpdateFavorites, data);
+        return;
+    }
+
     if (self->mFavoritesDirtyFlags == 0)
     {
-        // already processed either on previous run or by a different callback
-        gIdleCallbacks.deleteFunction(&LLFolderViewFolder::onIdleUpdateFavorites, self);
+        llassert(false); // should not happen, everything that sets to 0 should clean callback
+        gIdleCallbacks.deleteFunction(&LLFolderViewFolder::onIdleUpdateFavorites, data);
         return;
     }
 
@@ -1915,7 +1923,7 @@ void LLFolderViewFolder::onIdleUpdateFavorites(void* data)
                     // Parent will remove onIdleUpdateFavorites later, don't remove now,
                     // We are inside gIdleCallbacks. Removing 'self' callback is safe,
                     // but removing 'parent' can invalidate following iterator
-                    parent->mFavoritesDirtyFlags = 0;
+                    parent->mFavoritesDirtyFlags = FAVORITE_CLEANUP;
                 }
                 parent = parent->getParentFolder();
             }
@@ -1981,7 +1989,7 @@ void LLFolderViewFolder::onIdleUpdateFavorites(void* data)
                         // Parent will remove onIdleUpdateFavorites later, don't remove now,
                         // We are inside gIdleCallbacks. Removing 'self' callback is safe,
                         // but removing 'parent' can invalidate following iterator
-                        parent->mFavoritesDirtyFlags = 0;
+                        parent->mFavoritesDirtyFlags = FAVORITE_CLEANUP;
                     }
                     parent = parent->getParentFolder();
                 }
@@ -1992,7 +2000,7 @@ void LLFolderViewFolder::onIdleUpdateFavorites(void* data)
                 // Parent will remove onIdleUpdateFavorites later, don't remove now.
                 // We are inside gIdleCallbacks. Removing 'self' callback is safe,
                 // but removing 'parent' can invalidate following iterator
-                parent->mFavoritesDirtyFlags = 0;
+                parent->mFavoritesDirtyFlags = FAVORITE_CLEANUP;
             }
             parent = parent->getParentFolder();
         }
diff --git a/indra/llui/llfolderviewitem.h b/indra/llui/llfolderviewitem.h
index c9b003b892..23d794bf26 100644
--- a/indra/llui/llfolderviewitem.h
+++ b/indra/llui/llfolderviewitem.h
@@ -421,6 +421,7 @@ private:
 
     constexpr static S32 FAVORITE_ADDED = 1;
     constexpr static S32 FAVORITE_REMOVED = 2;
+    constexpr static S32 FAVORITE_CLEANUP = 4;
     S32 mFavoritesDirtyFlags { 0 };
 public: