summaryrefslogtreecommitdiff
path: root/indra/newview/llfeaturemanager.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2015-12-04 16:09:15 -0500
committerNat Goodspeed <nat@lindenlab.com>2015-12-04 16:09:15 -0500
commitd69a0e692e420e5b95e9bcb4ad1e7c5cfa283468 (patch)
treedba5f50b894e52ad961f599702f3da801e3518b9 /indra/newview/llfeaturemanager.cpp
parentc4de6b93d3c3f182fc7bf28e5c285e4d14da0764 (diff)
parent6ed6158ac68076b6a6242a3a74a3394846227e04 (diff)
Automated merge with ssh://bitbucket.org/nat_linden/viewer-no-leap-test
Diffstat (limited to 'indra/newview/llfeaturemanager.cpp')
-rwxr-xr-xindra/newview/llfeaturemanager.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index ea39f812fd..b1e3f2bb14 100755
--- 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";