summaryrefslogtreecommitdiff
path: root/indra/newview/llmanip.cpp
diff options
context:
space:
mode:
authorDessie Linden <dessie@lindenlab.com>2010-06-24 06:22:00 -0700
committerDessie Linden <dessie@lindenlab.com>2010-06-24 06:22:00 -0700
commit18a476daceccd337e990eec367cac5b985c8836f (patch)
treef9ff83c4e4654876fe75459b6c92be54b134fe0a /indra/newview/llmanip.cpp
parent15909a45757252b98b4e8fdb098f08df1248ed4b (diff)
parentf0318bf68ef01fcf011da97073b75c3ddc29414d (diff)
Merged from viewer-release
Diffstat (limited to 'indra/newview/llmanip.cpp')
-rw-r--r--indra/newview/llmanip.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llmanip.cpp b/indra/newview/llmanip.cpp
index 957e88960d..a43118755e 100644
--- a/indra/newview/llmanip.cpp
+++ b/indra/newview/llmanip.cpp
@@ -435,12 +435,12 @@ void LLManip::renderXYZ(const LLVector3 &vec)
S32 vertical_offset = window_center_y - VERTICAL_OFFSET;
- glPushMatrix();
+ gGL.pushMatrix();
{
LLUIImagePtr imagep = LLUI::getUIImage("Rounded_Square");
gViewerWindow->setup2DRender();
const LLVector2& display_scale = gViewerWindow->getDisplayScale();
- glScalef(display_scale.mV[VX], display_scale.mV[VY], 1.f);
+ gGL.scalef(display_scale.mV[VX], display_scale.mV[VY], 1.f);
gGL.color4f(0.f, 0.f, 0.f, 0.7f);
imagep->draw(
@@ -450,7 +450,7 @@ void LLManip::renderXYZ(const LLVector3 &vec)
PAD * 2 + 10,
LLColor4(0.f, 0.f, 0.f, 0.7f) );
}
- glPopMatrix();
+ gGL.popMatrix();
gViewerWindow->setup3DRender();