From b80cd227042f8e461fa0a2f9a5ae3b448842b863 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Thu, 28 Jan 2010 09:50:06 +0200
Subject: [PATCH] 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
---
indra/newview/llviewerinventory.cpp | 21 ++-------------------
1 file changed, 2 insertions(+), 19 deletions(-)
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index f7529dd553f..a3cbd80c84f 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -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
--
GitLab