diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-09-23 13:31:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-23 13:31:55 -0700 |
| commit | d8e52ec001c476a2320f2d5caceb813465d707e4 (patch) | |
| tree | 2fe671253d83620fba0e0b1c6c488997b558a7ef /indra/newview/lldirpicker.h | |
| parent | 3747dd9a085e4d75ec21c8048f1269bc3f29e582 (diff) | |
| parent | 38916ebf367aa400d8151d78204e714d40e8c323 (diff) | |
Merge pull request #940 from secondlife/release/maint-b
Maintenance B merges into develop
Diffstat (limited to 'indra/newview/lldirpicker.h')
| -rw-r--r-- | indra/newview/lldirpicker.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lldirpicker.h b/indra/newview/lldirpicker.h index dc740caab2..2ac3db7c2e 100644 --- a/indra/newview/lldirpicker.h +++ b/indra/newview/lldirpicker.h @@ -77,8 +77,10 @@ private: #if LL_LINUX || LL_DARWIN // On Linux we just implement LLDirPicker on top of LLFilePicker +#ifndef LL_FLTK LLFilePicker *mFilePicker; #endif +#endif std::string* mFileName; |