Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Inital full retooling of appearance editor for multi-wearables. Also updated LLTabContainer to use standard commit and validate callback signals.

Browse Source
This commit is contained in:
Shyotl
2012-06-15 09:51:11 -05:00
parent 3796a216d2
commit 4c45e9a9d1
41 changed files with 717 additions and 682 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
indra/newview/llpanelmaininventory.cpp
View File

@@ -215,9 +215,7 @@ BOOL LLInventoryView::postBuild()
sActiveViews.put(this);
childSetTabChangeCallback("inventory filter tabs", "All Items", onFilterSelected, this);
childSetTabChangeCallback("inventory filter tabs", "Recent Items", onFilterSelected, this);
childSetTabChangeCallback("inventory filter tabs", "Worn Items", onFilterSelected, this);
getChild<LLTabContainer>("inventory filter tabs")->setCommitCallback(boost::bind(&LLInventoryView::onFilterSelected,this));
childSetAction("Inventory.ResetAll",onResetAll,this);
childSetAction("Inventory.ExpandAll",onExpandAll,this);
@@ -764,21 +762,19 @@ void LLInventoryView::onCollapseAll(void* userdata)
self->mActivePanel->closeAllFolders();
}
//static
void LLInventoryView::onFilterSelected(void* userdata, bool from_click)
void LLInventoryView::onFilterSelected()
{
LLInventoryView* self = (LLInventoryView*) userdata;
// Find my index
self->mActivePanel = (LLInventoryPanel*)self->childGetVisibleTab("inventory filter tabs");
mActivePanel = (LLInventoryPanel*)childGetVisibleTab("inventory filter tabs");
if (!self->mActivePanel)
if (!mActivePanel)
{
return;
}
//self->setFilterSubString(self->mFilterSubString);
LLInventoryFilter* filter = self->mActivePanel->getFilter();
LLFloaterInventoryFinder *finder = self->getFinder();
//>setFilterSubString(self->mFilterSubString);
LLInventoryFilter* filter = mActivePanel->getFilter();
LLFloaterInventoryFinder *finder = getFinder();
if (finder)
{
finder->changeFilter(filter);
@@ -788,8 +784,8 @@ void LLInventoryView::onFilterSelected(void* userdata, bool from_click)
// If our filter is active we may be the first thing requiring a fetch so we better start it here.
LLInventoryModelBackgroundFetch::instance().start();
}
self->setFilterTextFromFilter();
self->updateSortControls();
setFilterTextFromFilter();
updateSortControls();
}
const std::string LLInventoryView::getFilterSubString()