diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-02-08 11:56:18 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-02-08 11:56:18 -0600 |
| commit | 9bd192d8b7ed5ea4a95bfa5cb6dd8163b8bcd298 (patch) | |
| tree | f4d964eb140b8bc175ee5cde2b555f93de9b594b /indra/newview/llnetmap.cpp | |
| parent | ac59a7c130f3fcbbb8f228bdf69c44ffa09f07a2 (diff) | |
| parent | 42df75bafeab49b408f23d79feb4f2213d2560eb (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(); } |