diff options
author | Oz Linden <oz@lindenlab.com> | 2013-06-13 15:28:13 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-06-13 15:28:13 -0400 |
commit | 2268bf38339178f93b317693c0a6808807301d64 (patch) | |
tree | 0a17c21975babce8422b9b62a1683947f5a58f2c /indra/newview/llglsandbox.cpp | |
parent | d233d8836b610b5e5ca76a1e3bb4d63dc3592e66 (diff) | |
parent | dcfb18373eca7986a73d8b9a1d34970cc0a23ed9 (diff) |
merge changes for 3.5.3-release
Diffstat (limited to 'indra/newview/llglsandbox.cpp')
-rwxr-xr-x[-rw-r--r--] | indra/newview/llglsandbox.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp index 1208c9378e..60fa53f491 100644..100755 --- a/indra/newview/llglsandbox.cpp +++ b/indra/newview/llglsandbox.cpp @@ -79,10 +79,10 @@ void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask) S32 top = llmax(y, mDragStartY); S32 bottom =llmin(y, mDragStartY); - left = llround((F32) left * LLUI::sGLScaleFactor.mV[VX]); - right = llround((F32) right * LLUI::sGLScaleFactor.mV[VX]); - top = llround((F32) top * LLUI::sGLScaleFactor.mV[VY]); - bottom = llround((F32) bottom * LLUI::sGLScaleFactor.mV[VY]); + left = llround((F32) left * LLUI::getScaleFactor().mV[VX]); + right = llround((F32) right * LLUI::getScaleFactor().mV[VX]); + top = llround((F32) top * LLUI::getScaleFactor().mV[VY]); + bottom = llround((F32) bottom * LLUI::getScaleFactor().mV[VY]); F32 old_far_plane = LLViewerCamera::getInstance()->getFar(); F32 old_near_plane = LLViewerCamera::getInstance()->getNear(); |