Merge pull request #2856 from secondlife/marchcat/c-develop

Develop → Maint C sync

1 files changed, 37 insertions, 37 deletions

diff --git a/indra/newview/llviewerfoldertype.cpp b/indra/newview/llviewerfoldertype.cpp
index 69eb82bb0b..e9c3277721 100644
--- a/indra/newview/llviewerfoldertype.cpp
+++ b/indra/newview/llviewerfoldertype.cpp
@@ -42,7 +42,7 @@ struct ViewerFolderEntry : public LLDictionaryEntry
     ViewerFolderEntry(const std::string &new_category_name, // default name when creating a new category of this type
                       const std::string &icon_name_open,    // name of the folder icon
                       const std::string &icon_name_closed,
-                      BOOL is_quiet,                        // folder doesn't need a UI update when changed
+                      bool is_quiet,                        // folder doesn't need a UI update when changed
                       bool hide_if_empty,                   // folder not shown if empty
                       const std::string &dictionary_name = empty_string // no reverse lookup needed on non-ensembles, so in most cases just leave this blank
         )
@@ -71,7 +71,7 @@ struct ViewerFolderEntry : public LLDictionaryEntry
         */
         mIconNameOpen("Inv_FolderOpen"), mIconNameClosed("Inv_FolderClosed"),
         mNewCategoryName(new_category_name),
-        mIsQuiet(FALSE),
+        mIsQuiet(false),
         mHideIfEmpty(false)
     {
         const std::string delims (",");
@@ -96,7 +96,7 @@ struct ViewerFolderEntry : public LLDictionaryEntry
     const std::string mNewCategoryName;
     typedef std::vector<std::string> name_vec_t;
     name_vec_t mAllowedNames;
-    BOOL mIsQuiet;
+    bool mIsQuiet;
     bool mHideIfEmpty;
 };
 
@@ -112,45 +112,45 @@ LLViewerFolderDictionary::LLViewerFolderDictionary()
 {
     //                                                                    NEW CATEGORY NAME         FOLDER OPEN             FOLDER CLOSED          QUIET?      HIDE IF EMPTY?
     //                                                                   |-------------------------|-----------------------|----------------------|-----------|--------------|
-    addEntry(LLFolderType::FT_TEXTURE,              new ViewerFolderEntry("Textures",               "Inv_SysOpen",          "Inv_SysClosed",        FALSE,     true));
-    addEntry(LLFolderType::FT_SOUND,                new ViewerFolderEntry("Sounds",                 "Inv_SysOpen",          "Inv_SysClosed",        FALSE,     true));
-    addEntry(LLFolderType::FT_CALLINGCARD,          new ViewerFolderEntry("Calling Cards",          "Inv_SysOpen",          "Inv_SysClosed",        FALSE,     true));
-    addEntry(LLFolderType::FT_LANDMARK,             new ViewerFolderEntry("Landmarks",              "Inv_SysOpen",          "Inv_SysClosed",        FALSE,     true));
-    addEntry(LLFolderType::FT_CLOTHING,             new ViewerFolderEntry("Clothing",               "Inv_SysOpen",          "Inv_SysClosed",        FALSE,     true));
-    addEntry(LLFolderType::FT_OBJECT,               new ViewerFolderEntry("Objects",                "Inv_SysOpen",          "Inv_SysClosed",        FALSE,     true));
-    addEntry(LLFolderType::FT_NOTECARD,             new ViewerFolderEntry("Notecards",              "Inv_SysOpen",          "Inv_SysClosed",        FALSE,     true));
-    addEntry(LLFolderType::FT_ROOT_INVENTORY,       new ViewerFolderEntry("My Inventory",           "Inv_SysOpen",          "Inv_SysClosed",        FALSE,     false));
-    addEntry(LLFolderType::FT_LSL_TEXT,             new ViewerFolderEntry("Scripts",                "Inv_SysOpen",          "Inv_SysClosed",        FALSE,     true));
-    addEntry(LLFolderType::FT_BODYPART,             new ViewerFolderEntry("Body Parts",             "Inv_SysOpen",          "Inv_SysClosed",        FALSE,     true));
-    addEntry(LLFolderType::FT_TRASH,                new ViewerFolderEntry("Trash",                  "Inv_TrashOpen",        "Inv_TrashClosed",      TRUE,      false));
-    addEntry(LLFolderType::FT_SNAPSHOT_CATEGORY,    new ViewerFolderEntry("Photo Album",            "Inv_SysOpen",          "Inv_SysClosed",        FALSE,     true));
-    addEntry(LLFolderType::FT_LOST_AND_FOUND,       new ViewerFolderEntry("Lost And Found",         "Inv_LostOpen",         "Inv_LostClosed",       TRUE,      true));
-    addEntry(LLFolderType::FT_ANIMATION,            new ViewerFolderEntry("Animations",             "Inv_SysOpen",          "Inv_SysClosed",        FALSE,     true));
-    addEntry(LLFolderType::FT_GESTURE,              new ViewerFolderEntry("Gestures",               "Inv_SysOpen",          "Inv_SysClosed",        FALSE,     true));
-    addEntry(LLFolderType::FT_FAVORITE,             new ViewerFolderEntry("Favorites",              "Inv_SysOpen",          "Inv_SysClosed",        FALSE,     true));
-
-    addEntry(LLFolderType::FT_CURRENT_OUTFIT,       new ViewerFolderEntry("Current Outfit",         "Inv_SysOpen",          "Inv_SysClosed",        TRUE,      false));
-    addEntry(LLFolderType::FT_OUTFIT,               new ViewerFolderEntry("New Outfit",             "Inv_LookFolderOpen",   "Inv_LookFolderClosed", TRUE,      false));
-    addEntry(LLFolderType::FT_MY_OUTFITS,           new ViewerFolderEntry("My Outfits",             "Inv_SysOpen",          "Inv_SysClosed",        TRUE,      true));
-    addEntry(LLFolderType::FT_MESH,                 new ViewerFolderEntry("Meshes",                 "Inv_SysOpen",          "Inv_SysClosed",        FALSE,     true));
-    addEntry(LLFolderType::FT_SETTINGS,             new ViewerFolderEntry("Settings",               "Inv_SysOpen",          "Inv_SysClosed",        FALSE,     true));
-    addEntry(LLFolderType::FT_MATERIAL,             new ViewerFolderEntry("Materials",              "Inv_SysOpen",          "Inv_SysClosed",        FALSE,     true));
+    addEntry(LLFolderType::FT_TEXTURE,              new ViewerFolderEntry("Textures",               "Inv_SysOpen",          "Inv_SysClosed",        false,     true));
+    addEntry(LLFolderType::FT_SOUND,                new ViewerFolderEntry("Sounds",                 "Inv_SysOpen",          "Inv_SysClosed",        false,     true));
+    addEntry(LLFolderType::FT_CALLINGCARD,          new ViewerFolderEntry("Calling Cards",          "Inv_SysOpen",          "Inv_SysClosed",        false,     true));
+    addEntry(LLFolderType::FT_LANDMARK,             new ViewerFolderEntry("Landmarks",              "Inv_SysOpen",          "Inv_SysClosed",        false,     true));
+    addEntry(LLFolderType::FT_CLOTHING,             new ViewerFolderEntry("Clothing",               "Inv_SysOpen",          "Inv_SysClosed",        false,     true));
+    addEntry(LLFolderType::FT_OBJECT,               new ViewerFolderEntry("Objects",                "Inv_SysOpen",          "Inv_SysClosed",        false,     true));
+    addEntry(LLFolderType::FT_NOTECARD,             new ViewerFolderEntry("Notecards",              "Inv_SysOpen",          "Inv_SysClosed",        false,     true));
+    addEntry(LLFolderType::FT_ROOT_INVENTORY,       new ViewerFolderEntry("My Inventory",           "Inv_SysOpen",          "Inv_SysClosed",        false,     false));
+    addEntry(LLFolderType::FT_LSL_TEXT,             new ViewerFolderEntry("Scripts",                "Inv_SysOpen",          "Inv_SysClosed",        false,     true));
+    addEntry(LLFolderType::FT_BODYPART,             new ViewerFolderEntry("Body Parts",             "Inv_SysOpen",          "Inv_SysClosed",        false,     true));
+    addEntry(LLFolderType::FT_TRASH,                new ViewerFolderEntry("Trash",                  "Inv_TrashOpen",        "Inv_TrashClosed",      true,      false));
+    addEntry(LLFolderType::FT_SNAPSHOT_CATEGORY,    new ViewerFolderEntry("Photo Album",            "Inv_SysOpen",          "Inv_SysClosed",        false,     true));
+    addEntry(LLFolderType::FT_LOST_AND_FOUND,       new ViewerFolderEntry("Lost And Found",         "Inv_LostOpen",         "Inv_LostClosed",       true,      true));
+    addEntry(LLFolderType::FT_ANIMATION,            new ViewerFolderEntry("Animations",             "Inv_SysOpen",          "Inv_SysClosed",        false,     true));
+    addEntry(LLFolderType::FT_GESTURE,              new ViewerFolderEntry("Gestures",               "Inv_SysOpen",          "Inv_SysClosed",        false,     true));
+    addEntry(LLFolderType::FT_FAVORITE,             new ViewerFolderEntry("Favorites",              "Inv_SysOpen",          "Inv_SysClosed",        false,     true));
+
+    addEntry(LLFolderType::FT_CURRENT_OUTFIT,       new ViewerFolderEntry("Current Outfit",         "Inv_SysOpen",          "Inv_SysClosed",        true,      false));
+    addEntry(LLFolderType::FT_OUTFIT,               new ViewerFolderEntry("New Outfit",             "Inv_LookFolderOpen",   "Inv_LookFolderClosed", true,      false));
+    addEntry(LLFolderType::FT_MY_OUTFITS,           new ViewerFolderEntry("My Outfits",             "Inv_SysOpen",          "Inv_SysClosed",        true,      true));
+    addEntry(LLFolderType::FT_MESH,                 new ViewerFolderEntry("Meshes",                 "Inv_SysOpen",          "Inv_SysClosed",        false,     true));
+    addEntry(LLFolderType::FT_SETTINGS,             new ViewerFolderEntry("Settings",               "Inv_SysOpen",          "Inv_SysClosed",        false,     true));
+    addEntry(LLFolderType::FT_MATERIAL,             new ViewerFolderEntry("Materials",              "Inv_SysOpen",          "Inv_SysClosed",        false,     true));
 
     bool boxes_invisible = !gSavedSettings.getBOOL("InventoryOutboxMakeVisible");
-    addEntry(LLFolderType::FT_INBOX,                new ViewerFolderEntry("Received Items",         "Inv_SysOpen",          "Inv_SysClosed",        FALSE,     boxes_invisible));
-    addEntry(LLFolderType::FT_OUTBOX,               new ViewerFolderEntry("Merchant Outbox",        "Inv_SysOpen",          "Inv_SysClosed",        FALSE,     true));
+    addEntry(LLFolderType::FT_INBOX,                new ViewerFolderEntry("Received Items",         "Inv_SysOpen",          "Inv_SysClosed",        false,     boxes_invisible));
+    addEntry(LLFolderType::FT_OUTBOX,               new ViewerFolderEntry("Merchant Outbox",        "Inv_SysOpen",          "Inv_SysClosed",        false,     true));
 
-    addEntry(LLFolderType::FT_BASIC_ROOT,           new ViewerFolderEntry("Basic Root",             "Inv_SysOpen",          "Inv_SysClosed",        FALSE,     true));
+    addEntry(LLFolderType::FT_BASIC_ROOT,           new ViewerFolderEntry("Basic Root",             "Inv_SysOpen",          "Inv_SysClosed",        false,     true));
 
-    addEntry(LLFolderType::FT_MARKETPLACE_LISTINGS, new ViewerFolderEntry("Marketplace Listings",   "Inv_SysOpen",          "Inv_SysClosed",        FALSE,     boxes_invisible));
-    addEntry(LLFolderType::FT_MARKETPLACE_STOCK,    new ViewerFolderEntry("New Stock",              "Inv_StockFolderOpen",  "Inv_StockFolderClosed",        FALSE,     false, "default"));
-    addEntry(LLFolderType::FT_MARKETPLACE_VERSION,  new ViewerFolderEntry("New Version",            "Inv_VersionFolderOpen","Inv_VersionFolderClosed",      FALSE,     false, "default"));
+    addEntry(LLFolderType::FT_MARKETPLACE_LISTINGS, new ViewerFolderEntry("Marketplace Listings",   "Inv_SysOpen",          "Inv_SysClosed",        false,     boxes_invisible));
+    addEntry(LLFolderType::FT_MARKETPLACE_STOCK,    new ViewerFolderEntry("New Stock",              "Inv_StockFolderOpen",  "Inv_StockFolderClosed",        false,     false, "default"));
+    addEntry(LLFolderType::FT_MARKETPLACE_VERSION,  new ViewerFolderEntry("New Version",            "Inv_VersionFolderOpen","Inv_VersionFolderClosed",      false,     false, "default"));
 
-    addEntry(LLFolderType::FT_NONE,                 new ViewerFolderEntry("New Folder",             "Inv_FolderOpen",       "Inv_FolderClosed",     FALSE,     false, "default"));
+    addEntry(LLFolderType::FT_NONE,                 new ViewerFolderEntry("New Folder",             "Inv_FolderOpen",       "Inv_FolderClosed",     false,     false, "default"));
 
     for (U32 type = (U32)LLFolderType::FT_ENSEMBLE_START; type <= (U32)LLFolderType::FT_ENSEMBLE_END; ++type)
     {
-        addEntry((LLFolderType::EType)type,         new ViewerFolderEntry("New Folder",             "Inv_FolderOpen",       "Inv_FolderClosed",     FALSE,     false));
+        addEntry((LLFolderType::EType)type,         new ViewerFolderEntry("New Folder",             "Inv_FolderOpen",       "Inv_FolderClosed",     false,     false));
     }
 }
 
@@ -236,7 +236,7 @@ LLFolderType::EType LLViewerFolderType::lookupTypeFromXUIName(const std::string
     return LLViewerFolderDictionary::getInstance()->lookup(name);
 }
 
-const std::string &LLViewerFolderType::lookupIconName(LLFolderType::EType folder_type, BOOL is_open)
+const std::string &LLViewerFolderType::lookupIconName(LLFolderType::EType folder_type, bool is_open)
 {
     const ViewerFolderEntry *entry = LLViewerFolderDictionary::getInstance()->lookup(folder_type);
     if (entry)
@@ -258,14 +258,14 @@ const std::string &LLViewerFolderType::lookupIconName(LLFolderType::EType folder
     return badLookup();
 }
 
-BOOL LLViewerFolderType::lookupIsQuietType(LLFolderType::EType folder_type)
+bool LLViewerFolderType::lookupIsQuietType(LLFolderType::EType folder_type)
 {
     const ViewerFolderEntry *entry = LLViewerFolderDictionary::getInstance()->lookup(folder_type);
     if (entry)
     {
         return entry->mIsQuiet;
     }
-    return FALSE;
+    return false;
 }
 
 bool LLViewerFolderType::lookupIsHiddenIfEmpty(LLFolderType::EType folder_type)