diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-06 20:03:52 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-06 20:03:52 +0200 |
| commit | d60962324ad8cb3b7c02f9b2412b785d33099cea (patch) | |
| tree | 0e6e97c6a65751909f85064932b93c4f4698d1ca /indra/llui/lllocalcliprect.cpp | |
| parent | 0d10e916ecb0bfc61b57d7645bd213fc90b15f56 (diff) | |
| parent | 66171216b01c1c5afafd3405a9d17e81f50c1925 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/lllocalcliprect.cpp')
| -rw-r--r-- | indra/llui/lllocalcliprect.cpp | 3 |
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; |