diff options
| author | Callum Prentice <callum@lindenlab.com> | 2021-06-07 18:55:00 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2021-06-07 18:55:00 -0700 |
| commit | ad9ed0a94dfd37878b35b70e0a365017a1e548bf (patch) | |
| tree | a86bee1eba9cd8c40c1408abf067e3f8f673a33f /indra/newview/lldirpicker.cpp | |
| parent | ac8640d338997020ca0650001ff004e1103ac5cb (diff) | |
| parent | 4623b822386accfae5907c88099c2a88377a0271 (diff) | |
Merge with tip of Master after Viewer release
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), |