diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-10-15 16:03:08 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-10-15 16:03:08 -0400 |
| commit | 64ecc38c841ae0cb0c3d0ccb9b1bf543ecf4230e (patch) | |
| tree | 24a954501d239ecaa43fe17f6f931e720383c6c2 /indra/newview/lldirpicker.h | |
| parent | a2ae46ef3a0036a6030ccc1e3ef4fcdfb7f455f3 (diff) | |
| parent | cd712960f316496b29c53dce390dd778ad9d27f4 (diff) | |
Merge branch 'develop' into maxim/lua-nearby-avatars
Diffstat (limited to 'indra/newview/lldirpicker.h')
| -rw-r--r-- | indra/newview/lldirpicker.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/lldirpicker.h b/indra/newview/lldirpicker.h index 2ac3db7c2e..dc740caab2 100644 --- a/indra/newview/lldirpicker.h +++ b/indra/newview/lldirpicker.h @@ -77,10 +77,8 @@ 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; |