diff options
| author | Baker Linden <baker@lindenlab.com> | 2013-01-09 15:25:06 -0800 |
|---|---|---|
| committer | Baker Linden <baker@lindenlab.com> | 2013-01-09 15:25:06 -0800 |
| commit | c4a1bd1c2f2e8da202c59d756e5d49b273e5145c (patch) | |
| tree | 96f3ccbb2c5d534f021052fafab97bedd6d57e91 /indra/newview/llfeaturemanager.cpp | |
| parent | b0c449d301299a4ba1b7d83e930f9df6b071b931 (diff) | |
| parent | cdd45b9abb35b40f2a31e7433fb99e588df8b40b (diff) | |
viewer-development 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 |