diff options
| author | leyla_linden <none@none> | 2011-02-14 16:32:36 -0800 |
|---|---|---|
| committer | leyla_linden <none@none> | 2011-02-14 16:32:36 -0800 |
| commit | 9fcc8c3161986a7eb8052aaf353a2a4d2e6974f5 (patch) | |
| tree | 2a4d6b8fe1f7255323e84d269575fe34bec39df2 /indra/newview/llselectmgr.cpp | |
| parent | a44b1ff511cb8f3399aa318ac15019ad97938c45 (diff) | |
| parent | 547293305bdc6c345f52519db514bb5be34c72ef (diff) | |
Merge
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
| -rw-r--r-- | indra/newview/llselectmgr.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 746ba274ed..93c9131424 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -5492,7 +5492,12 @@ void LLSelectNode::renderOneWireframe(const LLColor4& color) BOOL is_hud_object = objectp->isHUDAttachment(); - if (!is_hud_object) + if (drawable->isActive()) + { + glLoadMatrixd(gGLModelView); + glMultMatrixf((F32*) objectp->getRenderMatrix().mMatrix); + } + else if (!is_hud_object) { glLoadIdentity(); glMultMatrixd(gGLModelView); @@ -5500,11 +5505,6 @@ void LLSelectNode::renderOneWireframe(const LLColor4& color) glTranslatef(trans.mV[0], trans.mV[1], trans.mV[2]); } - if (drawable->isActive()) - { - glMultMatrixf((F32*) objectp->getRenderMatrix().mMatrix); - } - glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); if (LLSelectMgr::sRenderHiddenSelections) // && gFloaterTools && gFloaterTools->getVisible()) |