From 208ccf8c2c583669c78719d92aff0c354b85d151 Mon Sep 17 00:00:00 2001 From: Adam Moss Date: Wed, 18 Apr 2007 09:17:53 +0000 Subject: SL-24485, SL-40331, SL-23136, SL-40330, SL-25816, SL-40567, SL-40568: land moss/linuxmisc-r60383: misc linuxclient & opensource fixes. svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@60383 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/linuxmisc-r60383 -> release --- indra/newview/llfeaturemanager.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llfeaturemanager.cpp') diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index 7d7c2017aa..2b58e2b4c3 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -40,6 +40,8 @@ extern void write_debug(const std::string& str); #if LL_DARWIN const char FEATURE_TABLE_FILENAME[] = "featuretable_mac.txt"; +#elif LL_LINUX +const char FEATURE_TABLE_FILENAME[] = "featuretable_linux.txt"; #else const char FEATURE_TABLE_FILENAME[] = "featuretable.txt"; #endif -- cgit v1.2.3