summaryrefslogtreecommitdiff
path: root/indra/newview/llfeaturemanager.h
diff options
context:
space:
mode:
authormaksymsproductengine <maksymsproductengine@lindenlab.com>2014-12-08 19:24:13 +0200
committermaksymsproductengine <maksymsproductengine@lindenlab.com>2014-12-08 19:24:13 +0200
commit8f02cb4d09a8ef4849672499a2f95d3648f2a47f (patch)
treed82e7d715ca024418a364ea8d4f0af411b760fbc /indra/newview/llfeaturemanager.h
parent246390ab320623992c6f4fc2339bbe5ed23d2445 (diff)
parent6d48db868f7459fcf5f0e89d830a844e409d4163 (diff)
merge changes for 3.7.22-release
Diffstat (limited to 'indra/newview/llfeaturemanager.h')
-rwxr-xr-xindra/newview/llfeaturemanager.h3
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();