summaryrefslogtreecommitdiff
path: root/indra/newview/llnetmap.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2009-11-11 22:55:32 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2009-11-11 22:55:32 +0200
commitdb3991ca235f3ceefe888d03758cac5eccf1b552 (patch)
treec4712870f33c4b0fdcc13959ba2f940aa396b6b2 /indra/newview/llnetmap.cpp
parent2fd51b4c711aa7ab70da6d7e7dfcb380b87cbedf (diff)
parentb34ee7f9f405e25ac606a16435ed49c7187387d8 (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llnetmap.cpp')
-rw-r--r--indra/newview/llnetmap.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp
index 4286582cdc..6145588df2 100644
--- a/indra/newview/llnetmap.cpp
+++ b/indra/newview/llnetmap.cpp
@@ -155,11 +155,9 @@ void LLNetMap::draw()
F32 rotation = 0;
{
- LLGLEnable scissor(GL_SCISSOR_TEST);
-
+ LLLocalClipRect clip(getLocalRect());
{
gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
- LLLocalClipRect clip(getLocalRect());
glMatrixMode(GL_MODELVIEW);