diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-03-18 11:39:21 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-03-18 11:39:21 -0400 |
| commit | 605a99010fb534868e4c0abef1da09c8bcfbb884 (patch) | |
| tree | 77369edeba6a0e29fce278173b0ba0322f2d965b /indra/llui/lllocalcliprect.cpp | |
| parent | dd1f89d3a9316a8486460f7f354d54083c8ca688 (diff) | |
| parent | 34181d1566d91c8e5d659db0f64d6989c824fa1f (diff) | |
merge
Diffstat (limited to 'indra/llui/lllocalcliprect.cpp')
| -rw-r--r-- | indra/llui/lllocalcliprect.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llui/lllocalcliprect.cpp b/indra/llui/lllocalcliprect.cpp index 31ceb0766a..0620e0f52d 100644 --- a/indra/llui/lllocalcliprect.cpp +++ b/indra/llui/lllocalcliprect.cpp @@ -88,10 +88,10 @@ void LLScreenClipRect::updateScissorRegion() LLRect rect = sClipRectStack.top(); stop_glerror(); S32 x,y,w,h; - x = llfloor(rect.mLeft * LLUI::sGLScaleFactor.mV[VX]); - y = llfloor(rect.mBottom * LLUI::sGLScaleFactor.mV[VY]); - w = llmax(0, llceil(rect.getWidth() * LLUI::sGLScaleFactor.mV[VX])) + 1; - h = llmax(0, llceil(rect.getHeight() * LLUI::sGLScaleFactor.mV[VY])) + 1; + x = llfloor(rect.mLeft * LLUI::getScaleFactor().mV[VX]); + y = llfloor(rect.mBottom * LLUI::getScaleFactor().mV[VY]); + w = llmax(0, llceil(rect.getWidth() * LLUI::getScaleFactor().mV[VX])) + 1; + h = llmax(0, llceil(rect.getHeight() * LLUI::getScaleFactor().mV[VY])) + 1; glScissor( x,y,w,h ); stop_glerror(); } |