From bcb2d40c7d180d4d46858f5dfce9a1a7998891a3 Mon Sep 17 00:00:00 2001 From: JessicaLyon Date: Fri, 21 Jan 2011 16:50:35 -0500 Subject: [PATCH] Added patch provided by Satomi Ahn, FIRE-264. Fixes inventory text filtering issue which exist in the LL viewer. Thanks for the patch! --- indra/newview/llinventoryfilter.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp index 33c66f0877..18385b7ce6 100644 --- a/indra/newview/llinventoryfilter.cpp +++ b/indra/newview/llinventoryfilter.cpp @@ -409,16 +409,20 @@ void LLInventoryFilter::setFilterSubString(const std::string& string) { if (mFilterSubString != string) { + std::string filterSubStringNew = string; + LLStringUtil::trimHead(filterSubStringNew); + mFilterSubStringOrig = filterSubStringNew; + LLStringUtil::toUpper(filterSubStringNew); + // hitting BACKSPACE, for example - const BOOL less_restrictive = mFilterSubString.size() >= string.size() && !mFilterSubString.substr(0, string.size()).compare(string); + const BOOL less_restrictive = mFilterSubString.size() >= filterSubStringNew.size() + && !mFilterSubString.substr(0, filterSubStringNew.size()).compare(filterSubStringNew); // appending new characters - const BOOL more_restrictive = mFilterSubString.size() < string.size() && !string.substr(0, mFilterSubString.size()).compare(mFilterSubString); + const BOOL more_restrictive = mFilterSubString.size() < filterSubStringNew.size() + && !filterSubStringNew.substr(0, mFilterSubString.size()).compare(mFilterSubString); - mFilterSubStringOrig = string; - LLStringUtil::trimHead(mFilterSubStringOrig); - mFilterSubString = mFilterSubStringOrig; - LLStringUtil::toUpper(mFilterSubString); + mFilterSubString = filterSubStringNew; if (less_restrictive) { setModified(FILTER_LESS_RESTRICTIVE);