diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-10-20 12:51:51 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-10-20 12:51:51 -0400 |
| commit | 07d4d9b01d11762926402f37faf8acd497acc5a7 (patch) | |
| tree | 6fb6fcb1c9d38ff3af6b35afe0ed8d25af17ddb6 /indra/newview | |
| parent | 76876538715e3afbe456e2bf84173bde416d50e6 (diff) | |
Fix for automated merge comiple errors.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llhudnametag.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/llhudtext.cpp | 13 |
2 files changed, 3 insertions, 16 deletions
diff --git a/indra/newview/llhudnametag.cpp b/indra/newview/llhudnametag.cpp index fc758569e4..8caf4d3d4c 100644 --- a/indra/newview/llhudnametag.cpp +++ b/indra/newview/llhudnametag.cpp @@ -197,10 +197,10 @@ BOOL LLHUDNameTag::lineSegmentIntersect(const LLVector3& start, const LLVector3& } LLVector3 dir = end-start; - F32 t = 0.f; + F32 a, b, t; - if (LLTriangleRayIntersect(v[0], v[1], v[2], start, dir, NULL, NULL, &t, FALSE) || - LLTriangleRayIntersect(v[2], v[3], v[0], start, dir, NULL, NULL, &t, FALSE) ) + if (LLTriangleRayIntersect(v[0], v[1], v[2], start, dir, a, b, t, FALSE) || + LLTriangleRayIntersect(v[2], v[3], v[0], start, dir, a, b, t, FALSE) ) { if (t <= 1.f) { 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(); |