diff --git a/indra/newview/lldirpicker.cpp b/indra/newview/lldirpicker.cpp
index a720dc46b545f8f2bbbf5508f6b93d1d676a9abc..d1abbb0f513ffbc68073b9f76ecd1036712f369e 100644
--- a/indra/newview/lldirpicker.cpp
+++ b/indra/newview/lldirpicker.cpp
@@ -61,7 +61,9 @@ LLDirPicker LLDirPicker::sInstance;
 //
 #if LL_WINDOWS
 
-LLDirPicker::LLDirPicker() 
+LLDirPicker::LLDirPicker() :
+	mFileName(NULL),
+	mLocked(false)
 {
 }
 
@@ -125,7 +127,9 @@ std::string LLDirPicker::getDirName()
 /////////////////////////////////////////////DARWIN
 #elif LL_DARWIN
 
-LLDirPicker::LLDirPicker() 
+LLDirPicker::LLDirPicker() :
+	mFileName(NULL),
+	mLocked(false)
 {
 	reset();
 
@@ -262,13 +266,15 @@ std::string LLDirPicker::getDirName()
 
 void LLDirPicker::reset()
 {
-	mLocked = FALSE;
+	mLocked = false;
 	mDir.clear();
 }
 
 #elif LL_LINUX || LL_SOLARIS
 
-LLDirPicker::LLDirPicker() 
+LLDirPicker::LLDirPicker() :
+	mFileName(NULL),
+	mLocked(false)
 {
 	mFilePicker = new LLFilePicker();
 	reset();
diff --git a/indra/newview/lldirpicker.h b/indra/newview/lldirpicker.h
index 26f76915aeeccbdb16cb10af4cb531d7d5ac3b39..b48d2c66c4151b968efce04795a2623ba3a8620a 100644
--- a/indra/newview/lldirpicker.h
+++ b/indra/newview/lldirpicker.h
@@ -97,7 +97,7 @@ class LLDirPicker
 
 	std::string* mFileName;
 	std::string  mDir;
-	BOOL mLocked;
+	bool mLocked;
 
 	static LLDirPicker sInstance;