diff options
| author | Palmer <palmer@lindenlab.com> | 2010-02-12 15:16:19 -0800 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2010-02-12 15:16:19 -0800 |
| commit | 418504207bdbdac9b41f731d87562d7d08a229d2 (patch) | |
| tree | 8eb914baeeaa05fb8ce6f4556eabd697b3c45afe /indra/newview/llnetmap.cpp | |
| parent | 434436ef6b96f74eaf0daf687c6978d5a24d5be7 (diff) | |
| parent | 43ca4e104b613c95a1147751122f7ff007542e5c (diff) | |
merge
Diffstat (limited to 'indra/newview/llnetmap.cpp')
| -rw-r--r-- | indra/newview/llnetmap.cpp | 15 |
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(); } |