diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-01 08:11:15 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-01 08:11:15 -0700 |
| commit | 025c8909582f59f68f786d52bea06f5a272df0b5 (patch) | |
| tree | 6d9980e216f89c74776155432b32e6778f3b6367 /indra/llui/lllocalcliprect.cpp | |
| parent | 536a30d7f2083d39dbd6d06f16fa53064c3ee379 (diff) | |
| parent | 70c1e21956b8589c9873ac5fa6a05467dc2e0a89 (diff) | |
Merge vwr-dev-mat
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() |