Merge pull request #1413 from secondlife/gltf-dev-maint-a-merge

Merge Maint A to development

1 files changed, 3 insertions, 9 deletions

diff --git a/indra/newview/lldirpicker.h b/indra/newview/lldirpicker.h
index 52febe4523..12655229b3 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,12 +84,9 @@ private:
 	std::string* mFileName;
 	std::string  mDir;
 	bool mLocked;
+    void *pDialog;
+    boost::signals2::connection mEventListener;
 
-	static LLDirPicker sInstance;
-#if LL_WINDOWS
-	BROWSEINFO bi;
-#endif
-	
 public:
 	// don't call these directly please.
 	LLDirPicker();