diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-27 15:06:53 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-27 15:06:53 +0200 |
commit | d3d2a8d537bf1542c152afdb239f7021ebdbe78f (patch) | |
tree | 602b749a5e2c13384b27a69a845b782449f96748 /indra/newview/llfilepicker.h | |
parent | b68ccadd46d2ff094147ffd72318fd3a728c28eb (diff) | |
parent | 86cab299b01081c8c89587fd72d81460318e4ec1 (diff) |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llfilepicker.h')
-rw-r--r-- | indra/newview/llfilepicker.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llfilepicker.h b/indra/newview/llfilepicker.h index 7ecbc3db60..4f254ff67e 100644 --- a/indra/newview/llfilepicker.h +++ b/indra/newview/llfilepicker.h @@ -176,8 +176,7 @@ private: std::vector<std::string> mFiles; S32 mCurrentFile; - BOOL mLocked; - BOOL mMultiFile; + bool mLocked; static LLFilePicker sInstance; |