summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelmaininventory.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-03-01 15:25:35 -0600
committerDave Parks <davep@lindenlab.com>2010-03-01 15:25:35 -0600
commit99b0d17833a8a2efab9c08edf2ada3718736a5ba (patch)
tree8951e7aabe026917d299436ebc28019f9966cd02 /indra/newview/llpanelmaininventory.cpp
parent746037362ed07af0c799caf22cf9e425744359a0 (diff)
parent7564813d608f79e6fc70e1f58a861c640d1b6fa2 (diff)
Merge with viewer-2-0
Diffstat (limited to 'indra/newview/llpanelmaininventory.cpp')
-rw-r--r--indra/newview/llpanelmaininventory.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 2d3401966b..50cfc7d177 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -420,10 +420,8 @@ void LLPanelMainInventory::onFilterEdit(const std::string& search_string )
gInventory.startBackgroundFetch();
- std::string uppercase_search_string = search_string;
- LLStringUtil::toUpper(uppercase_search_string);
- mFilterSubString = uppercase_search_string;
- if (mActivePanel->getFilterSubString().empty() && uppercase_search_string.empty())
+ mFilterSubString = search_string;
+ if (mActivePanel->getFilterSubString().empty() && mFilterSubString.empty())
{
// current filter and new filter empty, do nothing
return;
@@ -437,7 +435,7 @@ void LLPanelMainInventory::onFilterEdit(const std::string& search_string )
}
// set new filter string
- mActivePanel->setFilterSubString(mFilterSubString);
+ setFilterSubString(mFilterSubString);
}