Merge branch 'main' into 2024.09-ExtraFPS

1 files changed, 70 insertions, 0 deletions

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index a78fe270bc..c1607eb13f 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -39,6 +39,7 @@
 #include "llfloaterreg.h"
 #include "llfloatersidepanelcontainer.h"
 #include "llinventorypanel.h"
+#include "llsidepanelinventory.h"
 #include "llnotifications.h"
 #include "llnotificationsutil.h"
 #include "llviewereventrecorder.h"
@@ -52,6 +53,9 @@
 #include "llagentui.h"
 #include "llagentwearables.h"
 #include "llagentpilot.h"
+// [SL:KB] - Patch: Appearance-PhantomAttach | Checked: Catznip-5.0
+#include "llattachmentsmgr.h"
+// [/SL:KB]
 #include "llcompilequeue.h"
 #include "llconsole.h"
 #include "lldebugview.h"
@@ -2171,6 +2175,13 @@ class LLAdvancedRebakeTextures : public view_listener_t
 };
 
 
+// [SL:KB] - Patch: Appearance-PhantomAttach | Checked: Catznip-5.0
+void handle_refresh_attachments()
+{
+    LLAttachmentsMgr::instance().refreshAttachments();
+}
+// [/SL:KB]
+
 #if 1 //ndef LL_RELEASE_FOR_DOWNLOAD
 ///////////////////////////
 // DEBUG AVATAR TEXTURES //
@@ -6732,6 +6743,59 @@ void handle_give_money_dialog()
     }
 }
 
+LLFloaterSidePanelContainer* get_favorite_inventory_folder()
+{
+    LLUUID folder_id = LLUUID(gSavedPerAccountSettings.getString("FavoriteFolder"));
+    if (!folder_id.isNull())
+    {
+        LLFloaterReg::const_instance_list_t& inst_list = LLFloaterReg::getFloaterList("inventory");
+        for (LLFloaterReg::const_instance_list_t::const_iterator iter = inst_list.begin(); iter != inst_list.end();)
+        {
+            LLFloaterSidePanelContainer* inventory_container = dynamic_cast<LLFloaterSidePanelContainer*>(*iter++);
+            if (inventory_container)
+            {
+                LLSidepanelInventory* sidepanel_inventory = dynamic_cast<LLSidepanelInventory*>(inventory_container->findChild<LLPanel>("main_panel", true));
+                if (sidepanel_inventory)
+                {
+                    LLPanelMainInventory* main_inventory = sidepanel_inventory->getMainInventoryPanel();
+                    if (main_inventory && main_inventory->isSingleFolderMode()
+                        && (main_inventory->getCurrentSFVRoot() == folder_id))
+                    {
+                        return inventory_container;
+                    }
+                }
+            }
+        }
+    }
+
+    return NULL;
+}
+
+void toggle_favorite_inventory_folder()
+{
+    LLUUID folder_id = LLUUID(gSavedPerAccountSettings.getString("FavoriteFolder"));
+    if ((folder_id.isNull()) || (!gInventory.getCategory(folder_id)))
+    {
+        LLNotificationsUtil::add("MissingFavoriteFolder");
+        return;
+    }
+
+    LLFloaterSidePanelContainer* inventory_container = get_favorite_inventory_folder();
+    if (inventory_container)
+    {
+        inventory_container->closeFloater();
+    }
+    else
+    {
+        LLPanelMainInventory::newFolderWindow(folder_id);
+    }
+}
+
+bool favorite_inventory_folder_visible()
+{
+    return (get_favorite_inventory_folder() != NULL);
+}
+
 bool enable_pay_avatar()
 {
     LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
@@ -9853,6 +9917,9 @@ void initialize_menus()
     view_listener_t::addMenu(new LLAdvancedCheckDebugCharacterVis(), "Advanced.CheckDebugCharacterVis");
     view_listener_t::addMenu(new LLAdvancedDumpAttachments(), "Advanced.DumpAttachments");
     view_listener_t::addMenu(new LLAdvancedRebakeTextures(), "Advanced.RebakeTextures");
+// [SL:KB] - Patch: Appearance-PhantomAttach | Checked: Catznip-5.0
+    commit.add("Advanced.RefreshAttachments", boost::bind(&handle_refresh_attachments));
+// [/SL:KB]
     view_listener_t::addMenu(new LLAdvancedDebugAvatarTextures(), "Advanced.DebugAvatarTextures");
     view_listener_t::addMenu(new LLAdvancedDumpAvatarLocalTextures(), "Advanced.DumpAvatarLocalTextures");
     // Advanced > Network
@@ -10058,6 +10125,9 @@ void initialize_menus()
 
     commit.add("Inventory.NewWindow", boost::bind(&LLPanelMainInventory::newWindow));
 
+    commit.add("Inventory.OpenFavoriteFolder", boost::bind(&toggle_favorite_inventory_folder));
+    enable.add("Inventory.IsFavoriteFolderOpen", boost::bind(&favorite_inventory_folder_visible));
+
     enable.add("EnablePayObject", boost::bind(&enable_pay_object));
     enable.add("EnablePayAvatar", boost::bind(&enable_pay_avatar));
     enable.add("EnableEdit", boost::bind(&enable_object_edit));