Merge branch 'DRTVWR-600-maint-A' into signal/trim-trailing

1 files changed, 4 insertions, 4 deletions

diff --git a/indra/llappearance/llwearabledata.h b/indra/llappearance/llwearabledata.h
index 4276335bd6..1266aed008 100644
--- a/indra/llappearance/llwearabledata.h
+++ b/indra/llappearance/llwearabledata.h
@@ -60,11 +60,11 @@ public:
     const LLWearable*   getBottomWearable(const LLWearableType::EType type) const;
     U32             getWearableCount(const LLWearableType::EType type) const;
     U32             getWearableCount(const U32 tex_index) const;
-    BOOL            getWearableIndex(const LLWearable *wearable, U32& index) const;
+    bool            getWearableIndex(const LLWearable *wearable, U32& index) const;
     U32             getClothingLayerCount() const;
-    BOOL            canAddWearable(const LLWearableType::EType type) const;
+    bool            canAddWearable(const LLWearableType::EType type) const;
 
-    BOOL            isOnTop(LLWearable* wearable) const;
+    bool            isOnTop(LLWearable* wearable) const;
 
     static const U32 MAX_CLOTHING_LAYERS = 60;
 
@@ -76,7 +76,7 @@ protected:
     void            setWearable(const LLWearableType::EType type, U32 index, LLWearable *wearable);
     void            pushWearable(const LLWearableType::EType type, LLWearable *wearable,
                                  bool trigger_updated = true);
-    virtual void    wearableUpdated(LLWearable *wearable, BOOL removed);
+    virtual void    wearableUpdated(LLWearable *wearable, bool removed);
     void            eraseWearable(LLWearable *wearable);
     void            eraseWearable(const LLWearableType::EType type, U32 index);
     void            clearWearableType(const LLWearableType::EType type);