summaryrefslogtreecommitdiff
path: root/indra/newview/lldirpicker.h
diff options
context:
space:
mode:
authorAdam Moss <moss@lindenlab.com>2007-09-10 20:15:48 +0000
committerAdam Moss <moss@lindenlab.com>2007-09-10 20:15:48 +0000
commit96830697b2f3bb8d1d7e1c4a3a6872845a38926c (patch)
tree7663da01ec8eefb6fcdc4d4396d95c96f89cc970 /indra/newview/lldirpicker.h
parent80dfa222fdc3747be9f5b64b9ace35907edf1c4e (diff)
SL-53811, SL-53812, SL-53823, SL-26604, SL-54282 Linux filepickers
revamp. Passed by QA. Reviewed by bos. svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@68938 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/SL-26604-based-on-r68938 -> release
Diffstat (limited to 'indra/newview/lldirpicker.h')
-rw-r--r--indra/newview/lldirpicker.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/lldirpicker.h b/indra/newview/lldirpicker.h
index 7a80d047e1..062e368d06 100644
--- a/indra/newview/lldirpicker.h
+++ b/indra/newview/lldirpicker.h
@@ -33,6 +33,8 @@
#include <commdlg.h>
#endif
+class LLFilePicker;
+
class LLDirPicker
{
public:
@@ -64,6 +66,11 @@ private:
#endif
+#if LL_LINUX
+ // On Linux we just implement LLDirPicker on top of LLFilePicker
+ LLFilePicker *mFilePicker;
+#endif
+
char mDirs[DIRNAME_BUFFER_SIZE]; /*Flawfinder: ignore*/
LLString* mFileName;
LLString mDir;