summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderviewitem.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-11-08 15:28:13 -0600
committerDave Parks <davep@lindenlab.com>2011-11-08 15:28:13 -0600
commit0d568ce9f0522eaa21a12fa5fae31f80c59bd947 (patch)
tree6b849a3b48a35feaeff0278ca8e562359df852e2 /indra/newview/llfolderviewitem.cpp
parent28c26cb491305525fb3f24ec2ef3bcb9b1ab8c5f (diff)
parentef8bdb5d95ebd869279ee4bb0510d54e51ab747f (diff)
merge
Diffstat (limited to 'indra/newview/llfolderviewitem.cpp')
-rw-r--r--indra/newview/llfolderviewitem.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp
index 622dcfe8dd..02222e430f 100644
--- a/indra/newview/llfolderviewitem.cpp
+++ b/indra/newview/llfolderviewitem.cpp
@@ -658,7 +658,7 @@ LLViewerInventoryItem * LLFolderViewItem::getInventoryItem(void)
return gInventory.getItem(getListener()->getUUID());
}
-std::string LLFolderViewItem::getName( void ) const
+const std::string& LLFolderViewItem::getName( void ) const
{
if(mListener)
{