summaryrefslogtreecommitdiff
path: root/indra/newview/llnetmap.cpp
diff options
context:
space:
mode:
authordavep@billy.gateway.2wire.net <davep@billy.gateway.2wire.net>2010-02-09 12:24:04 -0600
committerdavep@billy.gateway.2wire.net <davep@billy.gateway.2wire.net>2010-02-09 12:24:04 -0600
commit871a40f2f290106f9da58dd4d09cec28fbecb0fa (patch)
treefab5c657732c6da25a4fbcbd837af7389ec283f5 /indra/newview/llnetmap.cpp
parentd1efc0fd52c0e5dc59951f50435e121305fe9b69 (diff)
parent6d4b4762d1eb0a1431e1793a7254f8cac220062a (diff)
merge
Diffstat (limited to 'indra/newview/llnetmap.cpp')
-rw-r--r--indra/newview/llnetmap.cpp15
1 files changed, 15 insertions, 0 deletions
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp
index 234fe13217..05623198ab 100644
--- a/indra/newview/llnetmap.cpp
+++ b/indra/newview/llnetmap.cpp
@@ -153,6 +153,18 @@ void LLNetMap::draw()
// Prepare a scissor region
F32 rotation = 0;
+ gGL.pushMatrix();
+ gGL.pushUIMatrix();
+
+ LLVector3 offset = gGL.getUITranslation();
+ LLVector3 scale = gGL.getUIScale();
+
+ glLoadIdentity();
+ gGL.loadUIIdentity();
+
+ glScalef(scale.mV[0], scale.mV[1], scale.mV[2]);
+ gGL.translatef(offset.mV[0], offset.mV[1], offset.mV[2]);
+
{
LLLocalClipRect clip(getLocalRect());
{
@@ -435,6 +447,9 @@ void LLNetMap::draw()
}
}
+ gGL.popMatrix();
+ gGL.popUIMatrix();
+
LLUICtrl::draw();
}