diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-10-09 19:50:51 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-10-09 19:50:51 +0000 |
| commit | 846fc179b13ba06fe9a51be69d80e86d0f433a73 (patch) | |
| tree | 2061ad71bfdf04be832d8213b3fee643e6aec2ca /indra/newview/lldirpicker.cpp | |
| parent | 18ddd70d96dc572ad94c81f9a1a3d08d7c7cdbc7 (diff) | |
| parent | 7cd076c796126692c308df5416b42b24a96609fb (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.cpp')
| -rw-r--r-- | indra/newview/lldirpicker.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lldirpicker.cpp b/indra/newview/lldirpicker.cpp index b8e6e81ee6..01790ad19e 100644 --- a/indra/newview/lldirpicker.cpp +++ b/indra/newview/lldirpicker.cpp @@ -37,7 +37,7 @@ #include "llviewercontrol.h" #include "llwin32headerslean.h" -#if LL_LINUX || LL_SOLARIS || LL_DARWIN +#if LL_LINUX || LL_DARWIN # include "llfilepicker.h" #endif @@ -187,7 +187,7 @@ std::string LLDirPicker::getDirName() return mFilePicker->getFirstFile(); } -#elif LL_LINUX || LL_SOLARIS +#elif LL_LINUX LLDirPicker::LLDirPicker() : mFileName(NULL), |