diff options
| author | simon <none@none> | 2014-12-08 11:52:17 -0800 |
|---|---|---|
| committer | simon <none@none> | 2014-12-08 11:52:17 -0800 |
| commit | c3e18bc5378411089bbf76905febd73573a1891f (patch) | |
| tree | 02cbb60258c9b95cab55b1f9a0743fdade877ebf /indra/newview/llfeaturemanager.h | |
| parent | e8ea1a19afb4a33c33fff6ea7fb822433b179ae6 (diff) | |
| parent | ffb510a4522d91e387d26a674b0cc9ff732c44b8 (diff) | |
Merge downstream code and become version 3.7.23
Diffstat (limited to 'indra/newview/llfeaturemanager.h')
| -rwxr-xr-x | indra/newview/llfeaturemanager.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llfeaturemanager.h b/indra/newview/llfeaturemanager.h index 95141b241d..69078ccc21 100755 --- a/indra/newview/llfeaturemanager.h +++ b/indra/newview/llfeaturemanager.h @@ -162,9 +162,6 @@ protected: bool parseFeatureTable(std::string filename); ///< @returns TRUE is file parsed correctly, FALSE if not - bool parseGPUTable(std::string filename); - ///< @returns true if file parsed correctly, false if not - does not reflect whether or not the gpu was recognized - void initBaseMask(); |