1 files changed, 10 insertions, 8 deletions

diff --git a/linden/indra/llui/llview.cpp b/linden/indra/llui/llview.cpp
index 9442a5c..a047f99 100644
--- a/linden/indra/llui/llview.cpp
+++ b/linden/indra/llui/llview.cpp
@@ -224,11 +224,17 @@ void LLView::setMouseOpaque(BOOL b)
         mMouseOpaque = b;
 }
 
-void LLView::setToolTip(const LLString& msg)
+void LLView::setToolTip(const LLStringExplicit& msg)
 {
         mToolTipMsg = msg;
 }
 
+BOOL LLView::setToolTipArg(const LLStringExplicit& key, const LLStringExplicit& text)
+{
+        mToolTipMsg.setArg(key, text);
+        return TRUE;
+}
+
 // virtual
 void LLView::setRect(const LLRect& rect)
 {
@@ -288,7 +294,7 @@ void LLView::setSpanChildren( BOOL span_children )
 
 const LLString& LLView::getToolTip()
 {
-        return mToolTipMsg;
+        return mToolTipMsg.getString();
 }
 
 // virtual
@@ -884,18 +890,14 @@ BOOL LLView::handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect_scre
                         }
                 }
 
-                if (LLUI::sShowXUINames && (mToolTipMsg.find(".xml", 0) == LLString::npos) && 
+                tool_tip = mToolTipMsg.getString();
+                if (LLUI::sShowXUINames && (tool_tip.find(".xml", 0) == LLString::npos) && 
                         (mName.find("Drag", 0) == LLString::npos))
                 {
                         tool_tip = getShowNamesToolTip();
                 }
-                else
-                {
-                        tool_tip = mToolTipMsg;
-                }
                 
 
-
                 BOOL showNamesTextBox = LLUI::sShowXUINames && (getWidgetType() == WIDGET_TYPE_TEXT_BOX);
 
                 if( !handled && (mMouseOpaque || showNamesTextBox) && pointInView( x, y ) && !tool_tip.empty())