Merge branch 'develop' into nat/edu-channel

1 files changed, 13 insertions, 17 deletions

diff --git a/indra/newview/llagentwearables.h b/indra/newview/llagentwearables.h
index de3d91b87c..3b8ff93c76 100644
--- a/indra/newview/llagentwearables.h
+++ b/indra/newview/llagentwearables.h
@@ -66,16 +66,14 @@ public:
     // Queries
     //--------------------------------------------------------------------
 public:
-    BOOL            isWearingItem(const LLUUID& item_id) const;
-    BOOL            isWearableModifiable(LLWearableType::EType type, U32 index /*= 0*/) const;
-    BOOL            isWearableModifiable(const LLUUID& item_id) const;
+    bool            isWearingItem(const LLUUID& item_id) const;
+    bool            isWearableModifiable(LLWearableType::EType type, U32 index /*= 0*/) const;
+    bool            isWearableModifiable(const LLUUID& item_id) const;
 
-    BOOL            isWearableCopyable(LLWearableType::EType type, U32 index /*= 0*/) const;
-    BOOL            areWearablesLoaded() const;
+    bool            isWearableCopyable(LLWearableType::EType type, U32 index /*= 0*/) const;
+    bool            areWearablesLoaded() const;
     bool            isCOFChangeInProgress() const { return mCOFChangeInProgress; }
     F32             getCOFChangeTime() const { return mCOFChangeTimer.getElapsedTimeF32(); }
-    void            updateWearablesLoaded();
-    void            checkWearablesLoaded() const;
     bool            canMoveWearable(const LLUUID& item_id, bool closer_to_body) const;
 
     // Note: False for shape, skin, eyes, and hair, unless you have MORE than 1.
@@ -95,13 +93,13 @@ public:
     LLViewerWearable*       getViewerWearable(const LLWearableType::EType type, U32 index /*= 0*/);
     const LLViewerWearable* getViewerWearable(const LLWearableType::EType type, U32 index /*= 0*/) const;
     LLInventoryItem*    getWearableInventoryItem(LLWearableType::EType type, U32 index /*= 0*/);
-    static BOOL         selfHasWearable(LLWearableType::EType type);
+    static bool         selfHasWearable(LLWearableType::EType type);
 
     //--------------------------------------------------------------------
     // Setters
     //--------------------------------------------------------------------
 private:
-    /*virtual*/void wearableUpdated(LLWearable *wearable, BOOL removed);
+    /*virtual*/void wearableUpdated(LLWearable *wearable, bool removed);
 public:
     void            setWearableItem(LLInventoryItem* new_item, LLViewerWearable* wearable, bool do_append = false);
     void            setWearableOutfit(const LLInventoryItem::item_array_t& items, const std::vector< LLViewerWearable* >& wearables);
@@ -116,20 +114,18 @@ protected:
     void            addWearableToAgentInventory(LLPointer<LLInventoryCallback> cb,
                                                 LLViewerWearable* wearable,
                                                 const LLUUID& category_id = LLUUID::null,
-                                                BOOL notify = TRUE);
+                                                bool notify = true);
     void            addWearabletoAgentInventoryDone(const LLWearableType::EType type,
                                                     const U32 index,
                                                     const LLUUID& item_id,
                                                     LLViewerWearable* wearable);
-    void            recoverMissingWearable(const LLWearableType::EType type, U32 index /*= 0*/);
-    void            recoverMissingWearableDone();
 
     //--------------------------------------------------------------------
     // Editing/moving wearables
     //--------------------------------------------------------------------
 
 public:
-    static void     createWearable(LLWearableType::EType type, bool wear = false, const LLUUID& parent_id = LLUUID::null, std::function<void(const LLUUID&)> created_cb = NULL);
+    static void     createWearable(LLWearableType::EType type, bool wear = false, const LLUUID& parent_id = LLUUID::null, std::function<void(const LLUUID&)> created_cb = nullptr);
     static void     editWearable(const LLUUID& item_id);
     bool            moveWearable(const LLViewerInventoryItem* item, bool closer_to_body);
 
@@ -159,7 +155,7 @@ private:
     // Save Wearables
     //--------------------------------------------------------------------
 public:
-    void            saveWearableAs(const LLWearableType::EType type, const U32 index, const std::string& new_name, const std::string& description, BOOL save_in_lost_and_found);
+    void            saveWearableAs(const LLWearableType::EType type, const U32 index, const std::string& new_name, const std::string& description, bool save_in_lost_and_found);
     void            saveWearable(const LLWearableType::EType type, const U32 index,
                                  const std::string new_name = "");
     void            saveAllWearables();
@@ -212,13 +208,13 @@ private:
     // Member variables
     //--------------------------------------------------------------------
 private:
-    static BOOL     mInitialWearablesUpdateReceived;
-    BOOL            mWearablesLoaded;
+    static bool     mInitialWearablesUpdateReceived;
+    bool            mWearablesLoaded;
 
     /**
      * True if agent's outfit is being changed now.
      */
-    BOOL            mCOFChangeInProgress;
+    bool            mCOFChangeInProgress;
     LLTimer         mCOFChangeTimer;
 
     //--------------------------------------------------------------------------------