diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-01-23 13:36:50 -0800 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-01-23 13:36:50 -0800 |
| commit | 3e8bc28c88f16c1b8bba496704ec3a6156a25e1d (patch) | |
| tree | aa52be0bc7aa10d578ba000b8cd69d40271477a0 /indra/newview/llfeaturemanager.cpp | |
| parent | 7e9ac192d779e77cad0a0b785510190215fbe7a6 (diff) | |
| parent | a30a2c492d06c9ef843a43c0ff0be6f2826d6d0b (diff) | |
Merge
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 |