diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2013-01-24 14:28:09 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2013-01-24 14:28:09 -0500 |
| commit | 3b369770f7a81ca76b81087d2716c5f29211f7c2 (patch) | |
| tree | 70ad9096da75c663590a546fa9f12dcfe7b11373 /indra/newview/llfeaturemanager.cpp | |
| parent | 22db60ed0dfd606ab8f8d49141446442a4a72a48 (diff) | |
| parent | cebde0a32b4a8163010d9cbf5e6b3036865ed943 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llfeaturemanager.cpp')
| -rw-r--r-- | indra/newview/llfeaturemanager.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index 2b39b771e7..a4cadcd5dc 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -479,6 +479,7 @@ void LLFeatureManager::parseGPUTable(std::string filename) mGPUString = label; mGPUClass = (EGPUClass) strtol(cls.c_str(), NULL, 10); mGPUSupported = (BOOL) strtol(supported.c_str(), NULL, 10); + sscanf(expected_gl_version.c_str(), "%f", &mExpectedGLVersion); } } #if LL_EXPORT_GPU_TABLE |