diff options
| author | callum_linden <none@none> | 2014-11-14 14:52:33 -0800 |
|---|---|---|
| committer | callum_linden <none@none> | 2014-11-14 14:52:33 -0800 |
| commit | cfb1779e26d1ab15acdbc9d2fc5982b84af56765 (patch) | |
| tree | 144f7f5ddcce60c430ba1df9c26580d763a1bb8a /indra/newview | |
| parent | 78a75ca00f77d98a2fc62e8828df2eb5600bbad4 (diff) | |
| parent | 014065015a6a3a79c7786f22b65c99f856e413a0 (diff) | |
merge with head
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llfeaturemanager.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index 4db0422634..a1246e31d9 100755 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -76,7 +76,9 @@ const char FEATURE_TABLE_FILENAME[] = "featuretable%s.txt"; const char FEATURE_TABLE_VER_FILENAME[] = "featuretable%s.%s.txt"; #endif +#if 0 // consuming code in #if 0 below const char GPU_TABLE_FILENAME[] = "gpu_table.txt"; +#endif const char GPU_TABLE_VER_FILENAME[] = "gpu_table.%s.txt"; LLFeatureInfo::LLFeatureInfo(const std::string& name, const BOOL available, const F32 level) |