Second Life viewer sources 1.20.3

1 files changed, 8 insertions, 5 deletions

diff --git a/linden/indra/newview/llviewerdisplay.cpp b/linden/indra/newview/llviewerdisplay.cpp
index b4d6f27..72e3d5c 100644
--- a/linden/indra/newview/llviewerdisplay.cpp
+++ b/linden/indra/newview/llviewerdisplay.cpp
@@ -886,6 +886,11 @@ void render_ui_and_swap()
         LLGLState::checkStates();
 #endif
         
+        glPushMatrix();
+        glLoadMatrixd(gGLLastModelView);
+        glh::matrix4f saved_view = glh_get_current_modelview();
+        glh_set_current_modelview(glh_copy_matrix(gGLLastModelView));
+        
         {
                 BOOL to_texture = gPipeline.canUseVertexShaders() &&
                                                         LLPipeline::sRenderGlow &&
@@ -936,6 +941,9 @@ void render_ui_and_swap()
 
                 LLVertexBuffer::stopRender();
         }
+
+        glh_set_current_modelview(saved_view);
+        glPopMatrix();
 }
 
 void render_ui_and_swap_if_needed()
@@ -1030,11 +1038,6 @@ void render_ui_3d()
         //               so 3d elements requiring Z buffer are moved to LLDrawPoolHUD
         //
 
-        // Render selections
-        //glDisableClientState(GL_COLOR_ARRAY);
-        //glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-        //glDisableClientState(GL_NORMAL_ARRAY);
-
         /////////////////////////////////////////////////////////////
         //
         // Render 2.5D elements (2D elements in the world)