diff options
author | Ansariel Hiller <ansarielhiller@yahoo.de> | 2016-05-02 11:34:14 +0000 |
---|---|---|
committer | Ansariel Hiller <ansarielhiller@yahoo.de> | 2016-05-02 11:34:14 +0000 |
commit | e5b206c32191375d105c408c3ba3c3b5288cda03 (patch) | |
tree | 6f0993a0b2426f79b045ce1281b47384329cc6ad /indra/newview | |
parent | 9a83367e43205dcd76958f7773def9d7d0874ad7 (diff) |
Fixed startup crash on Windows
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/llfeaturemanager.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index 04da8f25cd..7f1c981a3c 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -66,12 +66,9 @@ const char FEATURE_TABLE_VER_FILENAME[] = "featuretable_mac.%s.txt"; #elif LL_LINUX const char FEATURE_TABLE_FILENAME[] = "featuretable_linux.txt"; const char FEATURE_TABLE_VER_FILENAME[] = "featuretable_linux.%s.txt"; -#elif LL_SOLARIS -const char FEATURE_TABLE_FILENAME[] = "featuretable_solaris.txt"; -const char FEATURE_TABLE_VER_FILENAME[] = "featuretable_solaris.%s.txt"; #else -const char FEATURE_TABLE_FILENAME[] = "featuretable%s.txt"; -const char FEATURE_TABLE_VER_FILENAME[] = "featuretable%s.%s.txt"; +const char FEATURE_TABLE_FILENAME[] = "featuretable.txt"; +const char FEATURE_TABLE_VER_FILENAME[] = "featuretable.%s.txt"; #endif #if 0 // consuming code in #if 0 below |