summaryrefslogtreecommitdiff
path: root/indra/llui/lllocalcliprect.cpp
diff options
context:
space:
mode:
authorrichard <none@none>2009-11-05 11:04:06 -0800
committerrichard <none@none>2009-11-05 11:04:06 -0800
commitd3d5965d8af250f76e143addcfb68b17390f483c (patch)
tree0f209c21c10fe775e582ce8a940a074af16dc458 /indra/llui/lllocalcliprect.cpp
parent535a98ce163e37b3bc495489923413701ea67995 (diff)
parentbbbacf1c4d06e7a0b4a5f532565410496a72963a (diff)
merge
Diffstat (limited to 'indra/llui/lllocalcliprect.cpp')
-rw-r--r--indra/llui/lllocalcliprect.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llui/lllocalcliprect.cpp b/indra/llui/lllocalcliprect.cpp
index 058b6ae178..43c21e250c 100644
--- a/indra/llui/lllocalcliprect.cpp
+++ b/indra/llui/lllocalcliprect.cpp
@@ -113,6 +113,9 @@ void LLScreenClipRect::updateScissorRegion()
{
if (sClipRectStack.empty()) return;
+ // finish any deferred calls in the old clipping region
+ gGL.flush();
+
LLRect rect = sClipRectStack.top();
stop_glerror();
S32 x,y,w,h;