summaryrefslogtreecommitdiff
path: root/indra/llui/llview.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-11-04 16:15:05 -0500
committerDave Parks <davep@lindenlab.com>2011-11-04 16:15:05 -0500
commit8a8e9ccdb67e7e8a492a4fe1505407ebe128ee18 (patch)
tree4ed3f649f3857fd765aa7e95a22b8d320520a2a6 /indra/llui/llview.cpp
parente82c0561fa5fa157efec445362b09360346ed382 (diff)
SH-2652 Don't allocate 6000+ strings every frame
Diffstat (limited to 'indra/llui/llview.cpp')
-rw-r--r--indra/llui/llview.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 1644f53978..486babb0ab 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -225,9 +225,11 @@ BOOL LLView::getUseBoundingRect() const
}
// virtual
-std::string LLView::getName() const
+const std::string& LLView::getName() const
{
- return mName.empty() ? std::string("(no name)") : mName;
+ static std::string no_name("(no name)");
+
+ return mName.empty() ? no_name : mName;
}
void LLView::sendChildToFront(LLView* child)