diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llwindow/llgl.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/linden/indra/llwindow/llgl.cpp b/linden/indra/llwindow/llgl.cpp index 547a353..ec22907 100644 --- a/linden/indra/llwindow/llgl.cpp +++ b/linden/indra/llwindow/llgl.cpp | |||
@@ -365,6 +365,7 @@ bool LLGLManager::initGL() | |||
365 | // from being recognized as ATI. | 365 | // from being recognized as ATI. |
366 | if (mGLVendor.substr(0,4) == "ATI ") | 366 | if (mGLVendor.substr(0,4) == "ATI ") |
367 | { | 367 | { |
368 | mGLVendorShort = "ATI"; | ||
368 | BOOL mobile = FALSE; | 369 | BOOL mobile = FALSE; |
369 | if (mGLRenderer.find("MOBILITY") != LLString::npos) | 370 | if (mGLRenderer.find("MOBILITY") != LLString::npos) |
370 | { | 371 | { |
@@ -404,6 +405,7 @@ bool LLGLManager::initGL() | |||
404 | } | 405 | } |
405 | else if (mGLVendor.find("NVIDIA ") != LLString::npos) | 406 | else if (mGLVendor.find("NVIDIA ") != LLString::npos) |
406 | { | 407 | { |
408 | mGLVendorShort = "NVIDIA"; | ||
407 | mIsNVIDIA = TRUE; | 409 | mIsNVIDIA = TRUE; |
408 | if ( mGLRenderer.find("GEFORCE4 MX") != LLString::npos | 410 | if ( mGLRenderer.find("GEFORCE4 MX") != LLString::npos |
409 | || mGLRenderer.find("GEFORCE2") != LLString::npos | 411 | || mGLRenderer.find("GEFORCE2") != LLString::npos |
@@ -428,9 +430,14 @@ bool LLGLManager::initGL() | |||
428 | } | 430 | } |
429 | else if (mGLVendor.find("INTEL") != LLString::npos) | 431 | else if (mGLVendor.find("INTEL") != LLString::npos) |
430 | { | 432 | { |
433 | mGLVendorShort = "INTEL"; | ||
431 | mIsIntel = TRUE; | 434 | mIsIntel = TRUE; |
432 | } | 435 | } |
433 | 436 | else | |
437 | { | ||
438 | mGLVendorShort = "MISC"; | ||
439 | } | ||
440 | |||
434 | // This is called here because it depends on the setting of mIsGF2or4MX, and sets up mHasMultitexture. | 441 | // This is called here because it depends on the setting of mIsGF2or4MX, and sets up mHasMultitexture. |
435 | initExtensions(); | 442 | initExtensions(); |
436 | 443 | ||