diff options
| author | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-12-12 10:58:47 -0800 |
|---|---|---|
| committer | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-12-12 10:58:47 -0800 |
| commit | 716e2ea3b1e25ac8da64343d02310e8f086c48e7 (patch) | |
| tree | 5e75da7a335881149c72d93525d275c6338fc1b5 /indra/newview/llfeaturemanager.cpp | |
| parent | 57db08d7927a4a93b8825405201e9e21efb8c756 (diff) | |
| parent | edcdce226a7ff599e43c89fe7e4d37350650ae96 (diff) | |
Pull and merge viewer-development
Diffstat (limited to 'indra/newview/llfeaturemanager.cpp')
| -rw-r--r-- | indra/newview/llfeaturemanager.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index 564cb046ce..0fa9f04309 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -458,7 +458,9 @@ void LLFeatureManager::parseGPUTable(std::string filename) json << "{'label' : '" << label << "',\n" << "'regexp' : '" << expr << "',\n" << "'class' : '" << cls << "',\n" << - "'supported' : '" << supported << "'\n},\n"; + "'supported' : '" << supported << "',\n" << + "'stats_based' : " << stats_based << ",\n" << + "'gl_version' : " << expected_gl_version << "\n},\n"; #endif for (U32 i = 0; i < expr.length(); i++) /*Flawfinder: ignore*/ |