1 files changed, 15 insertions, 5 deletions

diff --git a/linden/indra/newview/llcubemap.cpp b/linden/indra/newview/llcubemap.cpp
index 4406bc8..415b849 100644
--- a/linden/indra/newview/llcubemap.cpp
+++ b/linden/indra/newview/llcubemap.cpp
@@ -176,8 +176,6 @@ void LLCubeMap::bind()
 
                 glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
                 glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_MIN_FILTER, (use_cube_mipmaps? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR));
-                
-                glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
         }
         else
         {
@@ -220,11 +218,23 @@ void LLCubeMap::setMatrix(S32 stage)
 {
         mMatrixStage = stage;
         glActiveTextureARB(GL_TEXTURE0_ARB+stage);
+
+        F32 mat[16];
+        
+        glGetFloatv(GL_MODELVIEW_MATRIX, mat);
+        
+        LLVector3 x(mat);
+        LLVector3 y(mat+4);
+        LLVector3 z(mat+8);
+
+        LLMatrix3 mat3;
+        mat3.setRows(x,y,z);
+        LLMatrix4 trans(mat3);
+        trans.transpose();
+
         glMatrixMode(GL_TEXTURE);
         glPushMatrix();
-        LLMatrix4 tmat;
-        gCamera->getRotMatrixToParent(tmat);
-        glLoadMatrixf((F32 *)tmat.mMatrix);
+        glLoadMatrixf((F32 *)trans.mMatrix);
         glMatrixMode(GL_MODELVIEW);
 }