diff options
author | Dave Parks <davep@lindenlab.com> | 2011-09-15 00:55:11 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-09-15 00:55:11 -0500 |
commit | f72a24bf3a5bf7ecb826ef5e6d7f17dbb92d5db2 (patch) | |
tree | a4a070ba8b95645089dcd55a848baec41b625cbc /indra/newview/llglsandbox.cpp | |
parent | 758b936deaa0e6ea397c49afa5024315415eeb93 (diff) | |
parent | 530981a2149a74e1dc003cea1bbc9dc392fcae60 (diff) |
merge
Diffstat (limited to 'indra/newview/llglsandbox.cpp')
-rw-r--r-- | indra/newview/llglsandbox.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp index fa3f546157..8c872283bd 100644 --- a/indra/newview/llglsandbox.cpp +++ b/indra/newview/llglsandbox.cpp @@ -115,7 +115,7 @@ void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask) S32 center_y = (top + bottom) / 2; // save drawing mode - glMatrixMode(GL_PROJECTION); + gGL.matrixMode(LLRender::MM_PROJECTION); gGL.pushMatrix(); BOOL limit_select_distance = gSavedSettings.getBOOL("LimitSelectDistance"); @@ -230,9 +230,9 @@ void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask) } // restore drawing mode - glMatrixMode(GL_PROJECTION); + gGL.matrixMode(LLRender::MM_PROJECTION); gGL.popMatrix(); - glMatrixMode(GL_MODELVIEW); + gGL.matrixMode(LLRender::MM_MODELVIEW); // restore camera LLViewerCamera::getInstance()->setFar(old_far_plane); |