diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-11-24 06:56:57 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-11-24 06:56:57 -0500 |
| commit | b69be18d7b41b639d3c62354ca7ab6e3bc32f1cb (patch) | |
| tree | 355347be68e29f59ad5299abd9b42423359eb60e /indra/llui/llview.cpp | |
| parent | fb605a047aa1c6b293b9546a06ac800c53d109ba (diff) | |
| parent | 8c86a08e72708e96dcf67830518187a00478bbfd (diff) | |
merge changes for vmrg-193
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); |