summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2011-01-28 17:02:32 -0800
committerRoxie Linden <roxie@lindenlab.com>2011-01-28 17:02:32 -0800
commit403b509f3aac52c25d6207f35db5fed96a953a88 (patch)
treec47af7f9a39d3bbf08eda65b84da2819519173a5
parentfc4a36c63048e17145bfe21dbeec7611853bf5bd (diff)
parent159afd141d1a4de595084c70f2025e783e3defa8 (diff)
automated merge
-rw-r--r--indra/newview/llselectmgr.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 44ccbe22f7..8ffbd5510d 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -5490,13 +5490,15 @@ void LLSelectNode::renderOneWireframe(const LLColor4& color)
glMatrixMode(GL_MODELVIEW);
gGL.pushMatrix();
-
+
BOOL is_hud_object = objectp->isHUDAttachment();
if (!is_hud_object)
{
glLoadIdentity();
glMultMatrixd(gGLModelView);
+ LLVector3 trans = objectp->getRegion()->getOriginAgent();
+ glTranslatef(trans.mV[0], trans.mV[1], trans.mV[2]);
}
if (drawable->isActive())