summaryrefslogtreecommitdiff
path: root/indra/newview/llselectmgr.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-02-11 13:30:37 -0600
committerDave Parks <davep@lindenlab.com>2011-02-11 13:30:37 -0600
commit479b5ac8ac54ea0442a237ce55f439e465316ad0 (patch)
tree5c20305266a64da12ce4ab6bd71a9875bb4c7404 /indra/newview/llselectmgr.cpp
parent536e90a2fa037cd669bbdba7be9afb67e394c812 (diff)
SH-510 Fix for some mesh selection outlines appearing one region away.
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
-rw-r--r--indra/newview/llselectmgr.cpp12
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())