Skip to content
Snippets Groups Projects
Commit 9b9c1177 authored by Andrew Polunin's avatar Andrew Polunin
Browse files

fixed minor bug EXT-1615 Landmark name is truncated before @ character after...

fixed minor bug EXT-1615 Landmark name is truncated before @ character after placing landmark on Favorites Bar

--HG--
branch : product-engine
parent 910f25a3
No related branches found
No related tags found
No related merge requests found
...@@ -352,6 +352,8 @@ void LLPanelLandmarkInfo::createLandmark(const LLUUID& folder_id) ...@@ -352,6 +352,8 @@ void LLPanelLandmarkInfo::createLandmark(const LLUUID& folder_id)
} }
LLStringUtil::replaceChar(desc, '\n', ' '); LLStringUtil::replaceChar(desc, '\n', ' ');
LLViewerInventoryItem::insertDefaultSortField(name);
// If no folder chosen use the "Landmarks" folder. // If no folder chosen use the "Landmarks" folder.
LLLandmarkActions::createLandmarkHere(name, desc, LLLandmarkActions::createLandmarkHere(name, desc,
folder_id.notNull() ? folder_id : gInventory.findCategoryUUIDForType(LLFolderType::FT_LANDMARK)); folder_id.notNull() ? folder_id : gInventory.findCategoryUUIDForType(LLFolderType::FT_LANDMARK));
......
...@@ -1336,6 +1336,12 @@ BOOL LLViewerInventoryItem::extractSortFieldAndDisplayName(const std::string& na ...@@ -1336,6 +1336,12 @@ BOOL LLViewerInventoryItem::extractSortFieldAndDisplayName(const std::string& na
return result; return result;
} }
void LLViewerInventoryItem::insertDefaultSortField(std::string& name)
{
name.insert(0, std::string("1") + getSeparator());
}
// This returns true if the item that this item points to // This returns true if the item that this item points to
// doesn't exist in memory (i.e. LLInventoryModel). The baseitem // doesn't exist in memory (i.e. LLInventoryModel). The baseitem
// might still be in the database but just not loaded yet. // might still be in the database but just not loaded yet.
......
...@@ -81,6 +81,7 @@ class LLViewerInventoryItem : public LLInventoryItem, public boost::signals2::tr ...@@ -81,6 +81,7 @@ class LLViewerInventoryItem : public LLInventoryItem, public boost::signals2::tr
virtual U32 getCRC32() const; // really more of a checksum. virtual U32 getCRC32() const; // really more of a checksum.
static BOOL extractSortFieldAndDisplayName(const std::string& name, S32* sortField, std::string* displayName); static BOOL extractSortFieldAndDisplayName(const std::string& name, S32* sortField, std::string* displayName);
static void insertDefaultSortField(std::string& name);
// construct a complete viewer inventory item // construct a complete viewer inventory item
LLViewerInventoryItem(const LLUUID& uuid, const LLUUID& parent_uuid, LLViewerInventoryItem(const LLUUID& uuid, const LLUUID& parent_uuid,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment