1 files changed, 18 insertions, 18 deletions

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 97e1c1e6ee..6efb200ed8 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -124,18 +124,18 @@ public:
     }
 
     /*virtual*/
-    BOOL tick()
+    bool tick()
     {
         if(mEventTimer.hasExpired())
         {
             LLAppearanceMgr::instance().setOutfitLocked(false);
         }
-        return FALSE;
+        return false;
     }
     void stop() { mEventTimer.stop(); }
     void start() { mEventTimer.start(); }
     void reset() { mEventTimer.reset(); }
-    BOOL getStarted() { return mEventTimer.getStarted(); }
+    bool getStarted() { return mEventTimer.getStarted(); }
 
     LLTimer&  getEventTimer() { return mEventTimer;}
 };
@@ -332,7 +332,7 @@ public:
 
     // virtual
     // Will be deleted after returning true - only safe to do this if all callbacks have fired.
-    BOOL tick()
+    bool tick()
     {
         // mPendingRequests will be zero if all requests have been
         // responded to.  mWaitTimes.empty() will be true if we have
@@ -1335,7 +1335,7 @@ void LLWearableHoldingPattern::onWearableAssetFetch(LLViewerWearable *wearable)
                     wearable_item->setAssetUUID(new_wearable->getAssetID());
                     wearable_item->setTransactionID(new_wearable->getTransactionID());
                     gInventory.updateItem(wearable_item, LLInventoryObserver::INTERNAL);
-                    wearable_item->updateServer(FALSE);
+                    wearable_item->updateServer(false);
 
                     use_count++;
                 }
@@ -1735,7 +1735,7 @@ void LLAppearanceMgr::takeOffOutfit(const LLUUID& cat_id)
     LLInventoryModel::item_array_t items;
     LLFindWearablesEx collector(/*is_worn=*/ true, /*include_body_parts=*/ false);
 
-    gInventory.collectDescendentsIf(cat_id, cats, items, FALSE, collector);
+    gInventory.collectDescendentsIf(cat_id, cats, items, false, collector);
 
     LLInventoryModel::item_array_t::const_iterator it = items.begin();
     const LLInventoryModel::item_array_t::const_iterator it_end = items.end();
@@ -1918,7 +1918,7 @@ void LLAppearanceMgr::shallowCopyCategoryContents(const LLUUID& src_id, const LL
     }
 }
 
-BOOL LLAppearanceMgr::getCanMakeFolderIntoOutfit(const LLUUID& folder_id)
+bool LLAppearanceMgr::getCanMakeFolderIntoOutfit(const LLUUID& folder_id)
 {
     // These are the wearable items that are required for considering this
     // folder as containing a complete outfit.
@@ -1945,7 +1945,7 @@ BOOL LLAppearanceMgr::getCanMakeFolderIntoOutfit(const LLUUID& folder_id)
         }
     }
 
-    // If the folder contains the required wearables, return TRUE.
+    // If the folder contains the required wearables, return true.
     return ((required_wearables & folder_wearables) == required_wearables);
 }
 
@@ -2908,7 +2908,7 @@ void LLAppearanceMgr::wearInventoryCategoryOnAvatar( LLInventoryCategory* catego
         LLFloaterSidePanelContainer::showPanel("appearance", LLSD().with("type", "edit_outfit"));
     }
 
-    LLAppearanceMgr::changeOutfit(TRUE, category->getUUID(), append);
+    LLAppearanceMgr::changeOutfit(true, category->getUUID(), append);
 }
 
 // FIXME do we really want to search entire inventory for matching name?
@@ -4243,12 +4243,12 @@ bool LLAppearanceMgr::moveWearable(LLViewerInventoryItem* item, bool closer_to_b
 
     // FIXME switch to use AISv3 where supported.
     //items need to be updated on a dataserver
-    item->setComplete(TRUE);
-    item->updateServer(FALSE);
+    item->setComplete(true);
+    item->updateServer(false);
     gInventory.updateItem(item);
 
-    swap_item->setComplete(TRUE);
-    swap_item->updateServer(FALSE);
+    swap_item->setComplete(true);
+    swap_item->updateServer(false);
     gInventory.updateItem(swap_item);
 
     //to cause appearance of the agent to be updated
@@ -4402,15 +4402,15 @@ void LLAppearanceMgr::unregisterAttachment(const LLUUID& item_id)
     mAttachmentsChangeSignal();
 }
 
-BOOL LLAppearanceMgr::getIsInCOF(const LLUUID& obj_id) const
+bool LLAppearanceMgr::getIsInCOF(const LLUUID& obj_id) const
 {
     const LLUUID& cof = getCOF();
     if (obj_id == cof)
-        return TRUE;
+        return true;
     const LLInventoryObject* obj = gInventory.getObject(obj_id);
     if (obj && obj->getParentUUID() == cof)
-        return TRUE;
-    return FALSE;
+        return true;
+    return false;
 }
 
 bool LLAppearanceMgr::getIsInCOF(const LLInventoryObject* obj) const
@@ -4762,7 +4762,7 @@ public:
                 LLAppearanceMgr::getInstance()->wearInventoryCategory(category, true, false);
 
                 // *TODOw: This may not be necessary if initial outfit is chosen already -- josh
-                gAgent.setOutfitChosen(TRUE);
+                gAgent.setOutfitChosen(true);
             }
         }