livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Work on major bug EXT-3985 ([BSI] Landmarks created in Viewer 2.0 show up with 1@ in Viewer 1.23.x) 

-- removed using of the LM Prefix while renaming Inventori item

--HG--
branch : product-engine
meow-7.2.2
Mike Antipov 2010-01-28 09:50:06 +02:00
parent b3763f1ec1
commit b80cd22704
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
indra/newview/llviewerinventory.cpp
View File

@ -1310,27 +1310,10 @@ void LLViewerInventoryItem::setSortField(S32 sortField)
LLFavoritesOrderStorage::instance().setSortIndex(mUUID, sortField);
}
// *TODO: mantipov: REMOVE, EXT-3985
void LLViewerInventoryItem::rename(const std::string& n)
{
using std::string;
string new_name(n);
LLStringUtil::replaceNonstandardASCII(new_name, ' ');
LLStringUtil::replaceChar(new_name, '|', ' ');
LLStringUtil::trim(new_name);
LLStringUtil::truncate(new_name, DB_INV_ITEM_NAME_STR_LEN);
const char separator = getSeparator();
const string::size_type separatorPos = mName.find(separator, 0);
if (separatorPos < string::npos)
{
mName.replace(separatorPos + 1, string::npos, new_name);
}
else
{
mName = new_name;
}
LLInventoryItem::rename(n);
}
const LLPermissions& LLViewerInventoryItem::getPermissions() const