summaryrefslogtreecommitdiff
path: root/indra/newview/lldirpicker.h
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-01-27 15:06:53 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2010-01-27 15:06:53 +0200
commitd3d2a8d537bf1542c152afdb239f7021ebdbe78f (patch)
tree602b749a5e2c13384b27a69a845b782449f96748 /indra/newview/lldirpicker.h
parentb68ccadd46d2ff094147ffd72318fd3a728c28eb (diff)
parent86cab299b01081c8c89587fd72d81460318e4ec1 (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/lldirpicker.h')
-rw-r--r--indra/newview/lldirpicker.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldirpicker.h b/indra/newview/lldirpicker.h
index 26f76915ae..b48d2c66c4 100644
--- a/indra/newview/lldirpicker.h
+++ b/indra/newview/lldirpicker.h
@@ -97,7 +97,7 @@ private:
std::string* mFileName;
std::string mDir;
- BOOL mLocked;
+ bool mLocked;
static LLDirPicker sInstance;