livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

meow-7.2.2
Dave Parks 2011-02-11 13:30:52 -06:00
parent 6b196c0ece 479b5ac8ac
commit f546f06452
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llselectmgr.cpp
View File

@ -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())