diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-13 12:50:06 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-13 12:50:06 +0000 |
| commit | 4f4afcf4890a7438fcff40c1782172a96dc2ed20 (patch) | |
| tree | b5a9b571edd1a46966cdd62e1c2fe289ef56d487 /indra/newview/llnetmap.cpp | |
| parent | fb994141dae9ce4357bdc37217e92631aeb943e3 (diff) | |
| parent | f5572abb5eb0c202c96e044f99e47bccfb97ef4a (diff) | |
merge backout.
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(); } |