Merge pull request #2534 from secondlife/release/luau-scripting

Add Lua scripting to develop, behind feature flag

1 files changed, 7 insertions, 1 deletions

diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h
index 6c45a32856..9e624f593f 100644
--- a/indra/newview/llappearancemgr.h
+++ b/indra/newview/llappearancemgr.h
@@ -59,7 +59,9 @@ public:
     void wearInventoryCategory(LLInventoryCategory* category, bool copy, bool append);
     void wearInventoryCategoryOnAvatar(LLInventoryCategory* category, bool append);
     void wearCategoryFinal(const LLUUID& cat_id, bool copy_items, bool append);
-    void wearOutfitByName(const std::string& name);
+    bool wearOutfit(const LLUUID &cat_id, std::string &error_msg, bool append = false);
+    bool wearOutfitByName(const std::string &name, std::string &error_msg, bool append = false);
+    bool wearOutfitByName(const std::string &name, bool append = false);
     void changeOutfit(bool proceed, const LLUUID& category, bool append);
     void replaceCurrentOutfit(const LLUUID& new_outfit);
     void renameOutfit(const LLUUID& outfit_id);
@@ -261,6 +263,10 @@ 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,
+                    std::string &error_msg, bool copy_items, bool append);
+
     bool mAttachmentInvLinkEnabled;
     bool mOutfitIsDirty;
     bool mIsInUpdateAppearanceFromCOF; // to detect recursive calls.