Second Life viewer sources 1.21.0-RC

1 files changed, 13 insertions, 20 deletions

diff --git a/linden/indra/newview/llcubemap.cpp b/linden/indra/llrender/llcubemap.cpp
index f79fd0f..563d616 100644
--- a/linden/indra/newview/llcubemap.cpp
+++ b/linden/indra/llrender/llcubemap.cpp
@@ -28,22 +28,21 @@
  * COMPLETENESS OR PERFORMANCE.
  * $/LicenseInfo$
  */
+#include "linden_common.h"
 
-#include "llviewerprecompiledheaders.h"
-#include "llfeaturemanager.h"
 #include "llworkerthread.h"
 
 #include "llcubemap.h"
 
 #include "v4coloru.h"
 #include "v3math.h"
+#include "v3dmath.h"
+#include "m3math.h"
+#include "m4math.h"
+#include "llcamera.h"
 
 #include "llrender.h"
 
-#include "llviewercamera.h"
-#include "llviewerimage.h"
-#include "llviewerimagelist.h"
-
 #include "llglheaders.h"
 
 const F32 epsilon = 1e-7f;
@@ -57,6 +56,8 @@ const BOOL use_cube_mipmaps = FALSE;
 const BOOL use_cube_mipmaps = FALSE;  //current build works best without cube mipmaps
 #endif
 
+bool LLCubeMap::sUseCubeMaps = true;
+
 LLCubeMap::LLCubeMap()
         : mTextureStage(0),
           mTextureCoordStage(0),
@@ -72,8 +73,7 @@ void LLCubeMap::initGL()
 {
         llassert(gGLManager.mInited);
 
-        if (gGLManager.mHasCubeMap
-            && LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap"))
+        if (gGLManager.mHasCubeMap && LLCubeMap::sUseCubeMaps)
         {
                 mTargets[0] = GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB;
                 mTargets[1] = GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB;
@@ -180,9 +180,7 @@ GLuint LLCubeMap::getGLName()
 
 void LLCubeMap::bind()
 {
-        if (gGLManager.mHasCubeMap
-            //&& LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap")
-            )
+        if (gGLManager.mHasCubeMap && LLCubeMap::sUseCubeMaps)
         {
                 // We assume that if they have cube mapping, they have multitexturing.
                 if (mTextureStage > 0)
@@ -213,10 +211,7 @@ void LLCubeMap::enable(S32 stage)
 void LLCubeMap::enableTexture(S32 stage)
 {
         mTextureStage = stage;
-        if (gGLManager.mHasCubeMap &&
-            stage >= 0
-            //&& LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap")
-            )
+        if (gGLManager.mHasCubeMap && stage >= 0 && LLCubeMap::sUseCubeMaps)
         {
                 if (stage > 0)
                 {
@@ -235,7 +230,7 @@ void LLCubeMap::enableTexture(S32 stage)
 void LLCubeMap::enableTextureCoords(S32 stage)
 {
         mTextureCoordStage = stage;
-        if (gGLManager.mHasCubeMap && stage >= 0)
+        if (gGLManager.mHasCubeMap && stage >= 0 && LLCubeMap::sUseCubeMaps)
         {
                 if (stage > 0)
                 {
@@ -265,9 +260,7 @@ void LLCubeMap::disable(void)
 
 void LLCubeMap::disableTexture(void)
 {
-        if (gGLManager.mHasCubeMap && mTextureStage >= 0
-            //&& LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap")
-            )
+        if (gGLManager.mHasCubeMap && mTextureStage >= 0 && LLCubeMap::sUseCubeMaps)
         {
                 if (mTextureStage > 0)
                 {
@@ -284,7 +277,7 @@ void LLCubeMap::disableTexture(void)
 
 void LLCubeMap::disableTextureCoords(void)
 {
-        if (gGLManager.mHasCubeMap && mTextureCoordStage >= 0)
+        if (gGLManager.mHasCubeMap && mTextureCoordStage >= 0 && LLCubeMap::sUseCubeMaps)
         {
                 if (mTextureCoordStage > 0)
                 {