diff options
author | Dave Parks <davep@lindenlab.com> | 2011-11-15 17:04:37 -0600 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-11-15 17:04:37 -0600 |
commit | cfb666e9d9eb8945a79e2f7999459267caca36ee (patch) | |
tree | b02e73c02f6f377c99fffc950d72525516647f52 /indra/llui/llview.cpp | |
parent | 09c74484ae0df267f01610ab4b594e50a01c05c1 (diff) | |
parent | b493b8cca491c4b7a76f4c98b34272970d3bb58b (diff) |
merge
Diffstat (limited to 'indra/llui/llview.cpp')
-rw-r--r-- | indra/llui/llview.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index 3fd7e48428..486babb0ab 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -225,9 +225,11 @@ BOOL LLView::getUseBoundingRect() const } // virtual -std::string LLView::getName() const +const std::string& LLView::getName() const { - return mName.empty() ? std::string("(no name)") : mName; + static std::string no_name("(no name)"); + + return mName.empty() ? no_name : mName; } void LLView::sendChildToFront(LLView* child) @@ -1215,7 +1217,7 @@ void LLView::drawChild(LLView* childp, S32 x_offset, S32 y_offset, BOOL force_dr if ((childp->getVisible() && childp->getRect().isValid()) || force_draw) { - glMatrixMode(GL_MODELVIEW); + gGL.matrixMode(LLRender::MM_MODELVIEW); LLUI::pushMatrix(); { LLUI::translate((F32)childp->getRect().mLeft + x_offset, (F32)childp->getRect().mBottom + y_offset, 0.f); |