diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-11-08 15:28:13 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-11-08 15:28:13 -0600 |
| commit | 0d568ce9f0522eaa21a12fa5fae31f80c59bd947 (patch) | |
| tree | 6b849a3b48a35feaeff0278ca8e562359df852e2 /indra/llui/lltextbase.cpp | |
| parent | 28c26cb491305525fb3f24ec2ef3bcb9b1ab8c5f (diff) | |
| parent | ef8bdb5d95ebd869279ee4bb0510d54e51ab747f (diff) | |
merge
Diffstat (limited to 'indra/llui/lltextbase.cpp')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 919364be63..3b768166f1 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -2518,7 +2518,11 @@ BOOL LLTextSegment::handleDoubleClick(S32 x, S32 y, MASK mask) { return FALSE; } BOOL LLTextSegment::handleHover(S32 x, S32 y, MASK mask) { return FALSE; } BOOL LLTextSegment::handleScrollWheel(S32 x, S32 y, S32 clicks) { return FALSE; } BOOL LLTextSegment::handleToolTip(S32 x, S32 y, MASK mask) { return FALSE; } -std::string LLTextSegment::getName() const { return ""; } +const std::string& LLTextSegment::getName() const +{ + static std::string empty_string(""); + return empty_string; +} void LLTextSegment::onMouseCaptureLost() {} void LLTextSegment::screenPointToLocal(S32 screen_x, S32 screen_y, S32* local_x, S32* local_y) const {} void LLTextSegment::localPointToScreen(S32 local_x, S32 local_y, S32* screen_x, S32* screen_y) const {} |