diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-13 12:46:14 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-13 12:46:14 +0000 |
| commit | f0062fa41ae8849235a59808e28998d224a88b52 (patch) | |
| tree | 5f6a659fe68df042dd9b78641910745a1fd2fb04 /indra/newview/llnetmap.cpp | |
| parent | 995fca4d364d8f9c10a99047e0e62f19fa0bbda5 (diff) | |
| parent | bcbd12f7b1fd091284ac782eff63d4a18887a8e3 (diff) | |
merge from viewer2. this fucks up davep's optimizations, so I'll backout their backout next to restore them. I hope. Sheesh.
Diffstat (limited to 'indra/newview/llnetmap.cpp')
| -rw-r--r-- | indra/newview/llnetmap.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp index 05623198ab..234fe13217 100644 --- a/indra/newview/llnetmap.cpp +++ b/indra/newview/llnetmap.cpp @@ -153,18 +153,6 @@ 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()); { @@ -447,9 +435,6 @@ void LLNetMap::draw() } } - gGL.popMatrix(); - gGL.popUIMatrix(); - LLUICtrl::draw(); } |