summaryrefslogtreecommitdiff
path: root/indra/newview/lldirpicker.h
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2020-10-09 19:50:51 +0000
committerDave Houlton <euclid@lindenlab.com>2020-10-09 19:50:51 +0000
commit846fc179b13ba06fe9a51be69d80e86d0f433a73 (patch)
tree2061ad71bfdf04be832d8213b3fee643e6aec2ca /indra/newview/lldirpicker.h
parent18ddd70d96dc572ad94c81f9a1a3d08d7c7cdbc7 (diff)
parent7cd076c796126692c308df5416b42b24a96609fb (diff)
Merged in euclid-desolarisify (pull request #335)
DRTVWR-510 remove all LL_SOLARIS conditional code Approved-by: Andrey Kleshchev Approved-by: Michael Pohoreski
Diffstat (limited to 'indra/newview/lldirpicker.h')
-rw-r--r--indra/newview/lldirpicker.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldirpicker.h b/indra/newview/lldirpicker.h
index c7dba12130..52febe4523 100644
--- a/indra/newview/lldirpicker.h
+++ b/indra/newview/lldirpicker.h
@@ -78,7 +78,7 @@ private:
void buildDirname( void );
bool check_local_file_access_enabled();
-#if LL_LINUX || LL_SOLARIS || LL_DARWIN
+#if LL_LINUX || LL_DARWIN
// On Linux we just implement LLDirPicker on top of LLFilePicker
LLFilePicker *mFilePicker;
#endif