merge changes for latest snowstorm project viewer

1 files changed, 19 insertions, 1 deletions

diff --git a/indra/llui/lltooltip.cpp b/indra/llui/lltooltip.cpp
index f737d48abf..f52a3b3323 100644
--- a/indra/llui/lltooltip.cpp
+++ b/indra/llui/lltooltip.cpp
@@ -288,7 +288,7 @@ void LLToolTip::initFromParams(const LLToolTip::Params& p)
 		mTextBox->setText(p.message());
 	}
 
-	S32 text_width = llmin(p.max_width(), mTextBox->getTextPixelWidth());
+	S32 text_width = llmin(p.max_width(), mTextBox->getTextPixelWidth() + 1);
 	S32 text_height = mTextBox->getTextPixelHeight();
 	mTextBox->reshape(text_width, text_height);
 	if (mInfoButton)
@@ -390,6 +390,15 @@ bool LLToolTip::hasClickCallback()
 	return mHasClickCallback; 
 }
 
+void LLToolTip::getToolTipMessage(std::string & message)
+{
+	if (mTextBox)
+	{
+		message = mTextBox->getText();
+	}
+}
+
+
 
 //
 // LLToolTipMgr
@@ -594,5 +603,14 @@ void LLToolTipMgr::updateToolTipVisibility()
 }
 
 
+// Return the current tooltip text
+void LLToolTipMgr::getToolTipMessage(std::string & message)
+{
+	if (toolTipVisible())
+	{
+		mToolTip->getToolTipMessage(message);
+	}
+}
+
 
 // EOF