From 07d4d9b01d11762926402f37faf8acd497acc5a7 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Wed, 20 Oct 2010 12:51:51 -0400 Subject: Fix for automated merge comiple errors. --- indra/newview/llhudtext.cpp | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'indra/newview/llhudtext.cpp') 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(); -- cgit v1.3