diff options
| author | Richard Nelson <none@none> | 2010-07-30 15:17:50 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-07-30 15:17:50 -0700 |
| commit | c60fd88714727a86d5b905c1986bc2ca6013791e (patch) | |
| tree | c41da40bbfe02dc2d1441b95e5a0e84cf7dd300b /indra/llui/lllocalcliprect.cpp | |
| parent | fbd05e947829714d81278dfa0b138b22e32d56a7 (diff) | |
| parent | b95ad3b5cec84387d20d2a1af08eeb090b54b134 (diff) | |
merge
Diffstat (limited to 'indra/llui/lllocalcliprect.cpp')
| -rw-r--r-- | indra/llui/lllocalcliprect.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/lllocalcliprect.cpp b/indra/llui/lllocalcliprect.cpp index 55329f64e4..805d5879f7 100644 --- a/indra/llui/lllocalcliprect.cpp +++ b/indra/llui/lllocalcliprect.cpp @@ -45,9 +45,9 @@ LLScreenClipRect::LLScreenClipRect(const LLRect& rect, BOOL enabled) if (mEnabled) { pushClipRect(rect); + mScissorState.setEnabled(!sClipRectStack.empty()); + updateScissorRegion(); } - mScissorState.setEnabled(!sClipRectStack.empty()); - updateScissorRegion(); } LLScreenClipRect::~LLScreenClipRect() @@ -55,8 +55,8 @@ LLScreenClipRect::~LLScreenClipRect() if (mEnabled) { popClipRect(); + updateScissorRegion(); } - updateScissorRegion(); } //static |