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

FIRE-11307: Inventory filters don't persist after relog

Ansariel 2013-11-17 18:37:27 +01:00
parent 81cb25bc30
commit a76137e563
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
indra/newview/llpanelmaininventory.cpp
View File

@ -248,30 +248,43 @@ BOOL LLPanelMainInventory::postBuild()
// Load the persistent "Recent Items" settings.
// Note that the "All Items" settings do not persist.
// <FS:ND> bring back worn items panel.
//if(recent_items_panel)
//{
// if(savedFilterState.has(recent_items_panel->getFilter().getName()))
// {
// LLSD recent_items = savedFilterState.get(
// recent_items_panel->getFilter().getName());
// LLInventoryFilter::Params p;
// LLParamSDParser parser;
// parser.readSD(recent_items, p);
// recent_items_panel->getFilter().fromParams(p);
// }
//}
if(recent_items_panel)
{
if(savedFilterState.has(recent_items_panel->getFilter().getName()))
if(savedFilterState.has(recent_items_panel->getName()))
{
LLSD recent_items = savedFilterState.get(
recent_items_panel->getFilter().getName());
LLInventoryFilter::Params p;
recent_items_panel->getName());
LLInventoryPanel::InventoryState p;
LLParamSDParser parser;
parser.readSD(recent_items, p);
recent_items_panel->getFilter().fromParams(p);
recent_items_panel->getFilter().fromParams(p.filter);
}
}
// <FS:ND> bring back worn items panel.
if(worn_items_panel)
{
if(savedFilterState.has(worn_items_panel->getFilter().getName()))
if(savedFilterState.has(worn_items_panel->getName()))
{
LLSD worn_items = savedFilterState.get(
worn_items_panel->getFilter().getName());
LLInventoryFilter::Params p;
worn_items_panel->getName());
LLInventoryPanel::InventoryState p;
LLParamSDParser parser;
parser.readSD(worn_items, p);
recent_items_panel->getFilter().fromParams(p);
worn_items_panel->getFilter().fromParams(p.filter);
}
}
// </FS:ND>