From 03dbeb6f4da302f4c5f118c4d848b744495a7445 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Tue, 26 Jan 2010 17:32:12 -0800
Subject: [PATCH] CID-400 Checker: UNINIT_CTOR Function:
LLDirPicker::LLDirPicker() File: /indra/newview/lldirpicker.cpp
---
indra/newview/lldirpicker.cpp | 14 ++++++++++----
indra/newview/lldirpicker.h | 2 +-
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/indra/newview/lldirpicker.cpp b/indra/newview/lldirpicker.cpp
index a720dc46b54..d1abbb0f513 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 26f76915aee..b48d2c66c41 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;
--
GitLab