From 4a7385b6502d02f22ee7fd635a7aabf1b080dd5a Mon Sep 17 00:00:00 2001 From: Ansariel Date: Mon, 14 Nov 2016 12:02:57 +0100 Subject: [PATCH] Fix "Inventory.NewWindow" callback handler to not use legacy (and dangerous) legacy code (Ctrl-Shift-I for new inventory window is unaffected for us because of the way our secondary inventory window works) --- indra/newview/llpanelmaininventory.cpp | 2 +- indra/newview/llviewermenu.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 55521a7536..c289c8ed3f 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -128,7 +128,7 @@ LLPanelMainInventory::LLPanelMainInventory(const LLPanel::Params& p) mCommitCallbackRegistrar.add("Inventory.EmptyTrash", boost::bind(&LLInventoryModel::emptyFolderType, &gInventory, "ConfirmEmptyTrash", LLFolderType::FT_TRASH)); mCommitCallbackRegistrar.add("Inventory.EmptyLostAndFound", boost::bind(&LLInventoryModel::emptyFolderType, &gInventory, "ConfirmEmptyLostAndFound", LLFolderType::FT_LOST_AND_FOUND)); mCommitCallbackRegistrar.add("Inventory.DoCreate", boost::bind(&LLPanelMainInventory::doCreate, this, _2)); - //mCommitCallbackRegistrar.add("Inventory.NewWindow", boost::bind(&LLPanelMainInventory::newWindow, this)); + mCommitCallbackRegistrar.add("Inventory.NewWindow", boost::bind(&LLPanelMainInventory::newWindow, this)); // Re-enabled; Callback handler in LLViewerMenu is routing to unused (and dangerous) legacy code! mCommitCallbackRegistrar.add("Inventory.ShowFilters", boost::bind(&LLPanelMainInventory::toggleFindOptions, this)); mCommitCallbackRegistrar.add("Inventory.ResetFilters", boost::bind(&LLPanelMainInventory::resetFilters, this)); //mCommitCallbackRegistrar.add("Inventory.SetSortBy", boost::bind(&LLPanelMainInventory::setSortBy, this, _2)); // Sort By menu handlers diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 0b211d2b28..8945c36c8e 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -11386,7 +11386,8 @@ void initialize_menus() view_listener_t::addMenu(new FSResetPerAccountControl(), "ResetPerAccountControl"); // Control enhancements - commit.add("Inventory.NewWindow", boost::bind(&LLFloaterInventory::showAgentInventory)); + // Disabled; LLFloaterInventory is unused (and dangerous) legacy code! See LLPanelMainInventory instead + //commit.add("Inventory.NewWindow", boost::bind(&LLFloaterInventory::showAgentInventory)); enable.add("EnablePayObject", boost::bind(&enable_pay_object)); enable.add("EnablePayAvatar", boost::bind(&enable_pay_avatar));