Merge branch 'DRTVWR-600-maint-A' into signal/trim-trailing

1 files changed, 3 insertions, 9 deletions

diff --git a/indra/newview/lldirpicker.h b/indra/newview/lldirpicker.h
index e76a19dd40..dc740caab2 100644
--- a/indra/newview/lldirpicker.h
+++ b/indra/newview/lldirpicker.h
@@ -57,10 +57,7 @@ class LLFilePicker;
 class LLDirPicker
 {
 public:
-    // calling this before main() is undefined
-    static LLDirPicker& instance( void ) { return sInstance; }
-
-    BOOL getDir(std::string* filename, bool blocking = true);
+    bool getDir(std::string* filename, bool blocking = true);
     std::string getDirName();
 
     // clear any lists of buffers or whatever, and make sure the dir
@@ -87,11 +84,8 @@ private:
     std::string* mFileName;
     std::string  mDir;
     bool mLocked;
-
-    static LLDirPicker sInstance;
-#if LL_WINDOWS
-    BROWSEINFO bi;
-#endif
+    void *pDialog;
+    boost::signals2::connection mEventListener;
 
 public:
     // don't call these directly please.