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

Reverted inventory search behavor to pre v2. (search is per-panel, not global to the inventory floater)

Browse Source
This commit is contained in:
Shyotl
2012-02-28 18:46:54 -06:00
parent 2f632d3324
commit fb10af2723
5 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llinventorybridge.cpp
View File

@@ -5245,6 +5245,13 @@ void LLWearableBridge::wearOnAvatar()
void LLWearableBridge::wearAddOnAvatar()
{
// TODO: investigate wearables may not be loaded at this point EXT-8231
// Don't wear anything until initial wearables are loaded, can
// destroy clothing items.
if (!gAgentWearables.areWearablesLoaded())
{
LLNotificationsUtil::add("CanNotChangeAppearanceUntilLoaded");
return;
}
LLViewerInventoryItem* item = getItem();
if(item)

3
indra/newview/llinventoryfilter.cpp
View File

@@ -429,8 +429,9 @@ void LLInventoryFilter::setFilterSubString(const std::string& string)
}
// Cancel out filter links once the search string is modified
// Singu Note: No, don't do this...
{
mFilterOps.mFilterLinks = FILTERLINK_INCLUDE_LINKS;
//mFilterOps.mFilterLinks = FILTERLINK_INCLUDE_LINKS;
}
}
}

15
indra/newview/llpanelmaininventory.cpp
View File

@@ -170,6 +170,7 @@ BOOL LLInventoryView::postBuild()
worn_items_panel->setShowFolderState(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS);
worn_items_panel->getFilter()->markDefault();
worn_items_panel->setFilterWorn(true);
worn_items_panel->setFilterLinks(LLInventoryFilter::FILTERLINK_EXCLUDE_LINKS);
worn_items_panel->setSelectCallback(boost::bind(&LLInventoryView::onSelectionChange, this, worn_items_panel, _1, _2));
}
@@ -526,7 +527,6 @@ void LLInventoryView::onClearSearch(void* user_data)
{
self->mActivePanel->setFilterSubString(LLStringUtil::null);
self->mActivePanel->setFilterTypes(0xffffffff);
self->mActivePanel->setFilterLinks(LLInventoryFilter::FILTERLINK_INCLUDE_LINKS);
}
if (finder)
@@ -543,7 +543,7 @@ void LLInventoryView::onClearSearch(void* user_data)
self->mActivePanel->getRootFolder()->applyFunctorRecursively(opener);
self->mActivePanel->getRootFolder()->scrollToShowSelection();
}
self->mFilterSubString = "";
//self->mFilterSubString = "";
}
//static
@@ -561,8 +561,11 @@ void LLInventoryView::onSearchEdit(const std::string& search_string, void* user_
LLInventoryModelBackgroundFetch::instance().start();
self->mFilterSubString = search_string;
if (self->mActivePanel->getFilterSubString().empty() && self->mFilterSubString.empty())
//self->mFilterSubString = search_string;
std::string filter_text = search_string;
std::string uppercase_search_string = filter_text;
LLStringUtil::toUpper(uppercase_search_string);
if (self->mActivePanel->getFilterSubString().empty() && uppercase_search_string.empty() /*self->mFilterSubString.empty()*/)
{
// current filter and new filter empty, do nothing
return;
@@ -576,7 +579,7 @@ void LLInventoryView::onSearchEdit(const std::string& search_string, void* user_
}
// set new filter string
self->setFilterSubString(self->mFilterSubString);
self->mActivePanel->setFilterSubString(uppercase_search_string/*self->mFilterSubString*/);
}
struct FilterEntry : public LLDictionaryEntry
@@ -773,7 +776,7 @@ void LLInventoryView::onFilterSelected(void* userdata, bool from_click)
return;
}
self->setFilterSubString(self->mFilterSubString);
//self->setFilterSubString(self->mFilterSubString);
LLInventoryFilter* filter = self->mActivePanel->getFilter();
LLFloaterInventoryFinder *finder = self->getFinder();
if (finder)

2
indra/newview/llpanelmaininventory.h
View File

@@ -169,7 +169,7 @@ protected:
bool mResortActivePanel;
LLSaveFolderState* mSavedFolderState;
std::string mFilterText;
std::string mFilterSubString;
//std::string mFilterSubString;
// This container is used to hold all active inventory views. This

13
indra/newview/llwearable.cpp
View File

@@ -161,8 +161,7 @@ BOOL LLWearable::FileExportTextures( FILE* file )
iter != mTEMap.end(); ++iter)
{
S32 te = iter->first;
LLUUID& image_id = iter->second->getID();
fprintf( file, "%d %s\n", te, image_id.asString().c_str() );
fprintf( file, "%d %s\n", te, iter->second->getID().asString().c_str() );
}
return TRUE;
@@ -1243,11 +1242,11 @@ void LLWearable::pullCrossWearableValues()
//pretty sure is right
if(param->getID() == 507)
avatar->setActualBoobGrav(param->getWeight());
/*if(param->getID() == 151)
avatar->setActualButtGrav(param->getWeight());
if(param->getID() == 157)
avatar->setActualFatGrav(param->getWeight());
*//*
//if(param->getID() == 151)
// avatar->setActualButtGrav(param->getWeight());
//if(param->getID() == 157)
// avatar->setActualFatGrav(param->getWeight());
//if(param->getID() == 507)
//{
// llwarns << "current = " << avatar->getActualBoobGrav() << llendl;