diff options
author | Dave Parks <davep@lindenlab.com> | 2011-10-05 19:18:58 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-10-05 19:18:58 -0500 |
commit | 1f4bc180502d1a4448e18715596a61ae9f406c4f (patch) | |
tree | 009f70b9f3d27ce28571d0f056a169497bb74b9f /indra/newview/llglsandbox.cpp | |
parent | 194bedbb96a6dcfe90d5b731aeca8658c83f2306 (diff) | |
parent | 2b51a7a60942b1efc99cee43489ef2f92fa7a188 (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); |