diff options
Diffstat (limited to 'indra/newview/llappearancemgr.h')
| -rw-r--r-- | indra/newview/llappearancemgr.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h index 11d209e6b5..9e624f593f 100644 --- a/indra/newview/llappearancemgr.h +++ b/indra/newview/llappearancemgr.h @@ -89,7 +89,7 @@ public: LLPointer<LLInventoryCallback> cb); // Return whether this folder contains minimal contents suitable for making a full outfit. - BOOL getCanMakeFolderIntoOutfit(const LLUUID& folder_id); + bool getCanMakeFolderIntoOutfit(const LLUUID& folder_id); // Determine whether a given outfit can be removed. bool getCanRemoveOutfit(const LLUUID& outfit_cat_id); @@ -264,7 +264,7 @@ private: static void onOutfitRename(const LLSD& notification, const LLSD& response); // used by both wearOutfit(LLUUID) and wearOutfitByName(std::string) - bool wearOutfit(const std::string &desc, LLInventoryCategory* cat, + bool wearOutfit(const std::string &desc, LLInventoryCategory* cat, std::string &error_msg, bool copy_items, bool append); bool mAttachmentInvLinkEnabled; @@ -298,7 +298,7 @@ private: // Item-specific convenience functions public: // Is this in the COF? - BOOL getIsInCOF(const LLUUID& obj_id) const; + bool getIsInCOF(const LLUUID& obj_id) const; bool getIsInCOF(const LLInventoryObject* obj) const; // Is this in the COF and can the user delete it from the COF? bool getIsProtectedCOFItem(const LLUUID& obj_id) const; |