Second Life viewer sources 1.15.0.2

1 files changed, 12 insertions, 12 deletions

diff --git a/linden/indra/newview/llfeaturemanager.cpp b/linden/indra/newview/llfeaturemanager.cpp
index c0fd96b..57fbc64 100644
--- a/linden/indra/newview/llfeaturemanager.cpp
+++ b/linden/indra/newview/llfeaturemanager.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
@@ -192,7 +193,7 @@ BOOL LLFeatureManager::maskFeatures(const char *name)
         LLFeatureList *maskp = findMask(name);
         if (!maskp)
         {
-                llwarns << "Unknown feature mask " << name << llendl;
+//              llwarns << "Unknown feature mask " << name << llendl;
                 return FALSE;
         }
         llinfos << "Applying Feature Mask: " << name << llendl;
@@ -450,14 +451,6 @@ void LLFeatureManager::initGraphicsFeatureMasks()
         {
                 maskFeatures("ATI");
         }
-        if (gGLManager.mIsRadeon8500)
-        {
-                maskFeatures("Radeon8500");
-        }
-        if (gGLManager.mIsRadeon9700)
-        {
-                maskFeatures("Radeon9700");
-        }
         if (gGLManager.mIsGFFX)
         {
                 maskFeatures("GeForceFX");
@@ -470,11 +463,18 @@ void LLFeatureManager::initGraphicsFeatureMasks()
         {
                 maskFeatures("OpenGLPre15");
         }
-
-        if (gGLManager.mIsMobilityRadeon9000)
+        // Replaces ' ' with '_' in mGPUString to deal with inability for parser to handle spaces
+        std::string gpustr = mGPUString;
+        for (std::string::iterator iter = gpustr.begin(); iter != gpustr.end(); ++iter)
         {
-                maskFeatures("MobilityRadeon9000");
+                if (*iter == ' ')
+                {
+                        *iter = '_';
+                }
         }
+//      llinfos << "Masking features from gpu table match: " << gpustr << llendl;
+        maskFeatures(gpustr.c_str());
+
         if (isSafe())
         {
                 maskFeatures("safe");