diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index bc8fcb54bb054e484e921003ee18960d71560bad..4df67fcc88441bfb3cb8086d45847bafb2b82d25 100755
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -452,15 +452,23 @@ bool LLFeatureManager::loadGPUClass()
 		}
 #endif
 	}
+	else if (gGLManager.mGLVersion < 2.f)
+	{
+		mGPUClass = GPU_CLASS_0;
+	}
+	else if (gGLManager.mGLVersion < 3.f)
+	{
+		mGPUClass = GPU_CLASS_1;
+	}
 	else if (gbps < 5.f)
 	{
 		mGPUClass = GPU_CLASS_0;
 	}
-	else if (gbps < 10.f)
+	else if (gbps < 16.f)
 	{
 		mGPUClass = GPU_CLASS_1;
 	}
-	else if (gbps < 20.f)
+	else if (gbps < 32.f)
 	{
 		mGPUClass = GPU_CLASS_2;
 	}