1 files changed, 20 insertions, 10 deletions

diff --git a/linden/indra/newview/lldrawpoolbump.cpp b/linden/indra/newview/lldrawpoolbump.cpp
index 916454c..b0b8b02 100644
--- a/linden/indra/newview/lldrawpoolbump.cpp
+++ b/linden/indra/newview/lldrawpoolbump.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2003-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
@@ -35,6 +36,7 @@
 #include "llimagegl.h"
 #include "m3math.h"
 #include "m4math.h"
+#include "v4math.h"
 
 #include "llagent.h"
 #include "llcubemap.h"
@@ -46,7 +48,7 @@
 #include "llviewercamera.h"
 #include "llviewerimagelist.h"
 #include "pipeline.h"
-
+#include "llglslshader.h"
 
 //#include "llimagebmp.h"
 //#include "../tools/imdebug/imdebug.h"
@@ -160,7 +162,7 @@ LLDrawPoolBump::LLDrawPoolBump()
 
 void LLDrawPoolBump::prerender()
 {
-        mVertexShaderLevel = gPipeline.getVertexShaderLevel(LLPipeline::SHADER_OBJECT);
+        mVertexShaderLevel = LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_OBJECT);
 }
 
 // static
@@ -201,6 +203,11 @@ void LLDrawPoolBump::render(S32 pass)
 {
         LLFastTimer t(LLFastTimer::FTM_RENDER_BUMP);
         
+        if (!gPipeline.hasRenderType(LLDrawPool::POOL_SIMPLE))
+        {
+                return;
+        }
+        
         switch( pass )
         {
           case 0:
@@ -253,14 +260,17 @@ void LLDrawPoolBump::beginShiny()
                 cube_map->setMatrix(0);
                 cube_map->bind();
 
-                if (gPipeline.getVertexShaderLevel(LLPipeline::SHADER_OBJECT) > 0)
+                if (LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_OBJECT) > 0)
                 {
                         LLMatrix4 mat;
-                        glGetFloatv(GL_MODELVIEW_MATRIX, (F32*) mat.mMatrix);
-                        gPipeline.mObjectShinyProgram.bind();
-                        LLVector3 vec = LLVector3(gPipeline.mShinyOrigin) * mat;
-                        LLVector4 vec4(vec, gPipeline.mShinyOrigin.mV[3]);
-                        glUniform4fvARB(gPipeline.mObjectShinyProgram.mUniform[LLPipeline::GLSL_SHINY_ORIGIN], 1,
+                        mat.initRows(LLVector4(gGLModelView+0),
+                                                 LLVector4(gGLModelView+4),
+                                                 LLVector4(gGLModelView+8),
+                                                 LLVector4(gGLModelView+12));
+                        gObjectShinyProgram.bind();
+                        LLVector3 vec = LLVector3(gShinyOrigin) * mat;
+                        LLVector4 vec4(vec, gShinyOrigin.mV[3]);
+                        glUniform4fvARB(gObjectShinyProgram.mUniform[LLShaderMgr::SHINY_ORIGIN], 1,
                                 vec4.mV);
                 }
                 else
@@ -380,9 +390,9 @@ void LLDrawPoolBump::endShiny()
                 cube_map->disable();
                 cube_map->restoreMatrix();
 
-                if (gPipeline.getVertexShaderLevel(LLPipeline::SHADER_OBJECT) > 0)
+                if (LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_OBJECT) > 0)
                 {
-                        gPipeline.mObjectShinyProgram.unbind();
+                        gObjectShinyProgram.unbind();
                 }
 
                 glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE,          GL_MODULATE);