diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-01-15 16:55:04 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-01-15 16:55:04 -0500 |
| commit | bc22e587439a2822e5228508e7a4a1e2ec0121c5 (patch) | |
| tree | 442540d0c2760617a2c0cf0cb9ba1973ab6fb298 /indra/newview/llfeaturemanager.cpp | |
| parent | 317644f5d575ecd4e734c9a5327f2a062ebf914a (diff) | |
| parent | 5a5c023e291990a463b1a91846ce82c70da8daab (diff) | |
merge changes for 4.0.1-release
Diffstat (limited to 'indra/newview/llfeaturemanager.cpp')
| -rw-r--r-- | indra/newview/llfeaturemanager.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index ea39f812fd..b1e3f2bb14 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -60,8 +60,6 @@ #include "lldxhardware.h" #endif -#define LL_EXPORT_GPU_TABLE 0 - #if LL_DARWIN const char FEATURE_TABLE_FILENAME[] = "featuretable_mac.txt"; const char FEATURE_TABLE_VER_FILENAME[] = "featuretable_mac.%s.txt"; |