livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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)

meow-7.2.2
Ansariel 2016-11-14 12:02:57 +01:00
parent 883fbeca85
commit 4a7385b650
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llpanelmaininventory.cpp
View File

@ -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)); // <FS:Ansariel> 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)); // <FS:Zi> Sort By menu handlers

3
indra/newview/llviewermenu.cpp
View File

@ -11386,7 +11386,8 @@ void initialize_menus()
view_listener_t::addMenu(new FSResetPerAccountControl(), "ResetPerAccountControl");
// </FS:Ansariel> Control enhancements
commit.add("Inventory.NewWindow", boost::bind(&LLFloaterInventory::showAgentInventory));
// <FS:Ansariel> 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));