Added patch provided by Satomi Ahn, FIRE-264. Fixes inventory text filtering issue which exist in the LL viewer. Thanks for the patch!

meow-7.2.2
JessicaLyon 2011-01-21 16:50:35 -05:00
parent 5e18fdade8
commit bcb2d40c7d
1 changed files with 10 additions and 6 deletions

View File

@ -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);