summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderviewitem.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-11-15 17:04:37 -0600
committerDave Parks <davep@lindenlab.com>2011-11-15 17:04:37 -0600
commitcfb666e9d9eb8945a79e2f7999459267caca36ee (patch)
treeb02e73c02f6f377c99fffc950d72525516647f52 /indra/newview/llfolderviewitem.cpp
parent09c74484ae0df267f01610ab4b594e50a01c05c1 (diff)
parentb493b8cca491c4b7a76f4c98b34272970d3bb58b (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)
{