Fix for automated merge comiple errors.

1 files changed, 0 insertions, 13 deletions

diff --git a/indra/newview/llhudtext.cpp b/indra/newview/llhudtext.cpp
index 913bcb89a5..6a423e529a 100644
--- a/indra/newview/llhudtext.cpp
+++ b/indra/newview/llhudtext.cpp
@@ -108,7 +108,6 @@ LLHUDText::~LLHUDText()
 {
 }
 
-			LLTriangleRayIntersect(v[2], v[3], v[0], start, dir, a, b, t, FALSE) )
 void LLHUDText::render()
 {
 	if (!mOnHUDAttachment && sDisplayText)
@@ -271,18 +270,6 @@ void LLHUDText::renderText(BOOL for_select)
 	gGL.color4f(1.0f, 1.0f, 1.0f, 1.0f);
 }
 
-std::string LLHUDText::getString()
-{
-	std::ostringstream ostr;
-	for (U32 i = 0; i < mTextSegments.size(); ++i)
-	{
-		const std::string str = wstring_to_utf8str(mTextSegments[i].getText());
-		ostr << str;
-	}
-
-	return ostr.str();
-}
-
 void LLHUDText::setString(const std::string &text_utf8)
 {
 	mTextSegments.clear();