diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-06-19 17:56:43 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-06-19 17:56:43 -0400 |
| commit | 1108cd0e5c052176f9dacc69b04d702a06b744de (patch) | |
| tree | 21b0be76071d28b165f99f57086ce9a16c79bb34 /indra/llui/lllocalcliprect.cpp | |
| parent | 2268bf38339178f93b317693c0a6808807301d64 (diff) | |
| parent | 2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff) | |
merge changes for 3.6.0-release
Diffstat (limited to 'indra/llui/lllocalcliprect.cpp')
| -rwxr-xr-x | indra/llui/lllocalcliprect.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llui/lllocalcliprect.cpp b/indra/llui/lllocalcliprect.cpp index 0620e0f52d..f3a526faeb 100755 --- a/indra/llui/lllocalcliprect.cpp +++ b/indra/llui/lllocalcliprect.cpp @@ -33,7 +33,7 @@ LLScreenClipRect::LLScreenClipRect(const LLRect& rect, BOOL enabled) - : mScissorState(GL_SCISSOR_TEST), +: mScissorState(GL_SCISSOR_TEST), mEnabled(enabled) { if (mEnabled) @@ -100,10 +100,10 @@ void LLScreenClipRect::updateScissorRegion() // LLLocalClipRect //--------------------------------------------------------------------------- LLLocalClipRect::LLLocalClipRect(const LLRect& rect, BOOL enabled /* = TRUE */) - : LLScreenClipRect(LLRect(rect.mLeft + LLFontGL::sCurOrigin.mX, - rect.mTop + LLFontGL::sCurOrigin.mY, - rect.mRight + LLFontGL::sCurOrigin.mX, - rect.mBottom + LLFontGL::sCurOrigin.mY), enabled) +: LLScreenClipRect(LLRect(rect.mLeft + LLFontGL::sCurOrigin.mX, + rect.mTop + LLFontGL::sCurOrigin.mY, + rect.mRight + LLFontGL::sCurOrigin.mX, + rect.mBottom + LLFontGL::sCurOrigin.mY), enabled) {} LLLocalClipRect::~LLLocalClipRect() |