From 892fa594405f474177fc18632242d70556c4368b Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Tue, 7 Jun 2011 11:14:50 +0200 Subject: [PATCH 1/3] - internal : commented out unused LLAgentWearables code to make sure it doesn't accidentally get used --HG-- branch : RLVa --- indra/newview/llagentwearables.cpp | 86 +++++++++++++++--------------- indra/newview/llagentwearables.h | 8 +-- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp index e9a1acc779..e2298edb32 100644 --- a/indra/newview/llagentwearables.cpp +++ b/indra/newview/llagentwearables.cpp @@ -1798,55 +1798,55 @@ LLUUID LLAgentWearables::computeBakedTextureHash(LLVOAvatarDefines::EBakedTextur // User has picked "remove from avatar" from a menu. // static -void LLAgentWearables::userRemoveWearable(const LLWearableType::EType &type, const U32 &index) -{ - if (!(type==LLWearableType::WT_SHAPE || type==LLWearableType::WT_SKIN || type==LLWearableType::WT_HAIR || type==LLWearableType::WT_EYES)) //&& - //!((!gAgent.isTeen()) && (type==LLWearableType::WT_UNDERPANTS || type==LLWearableType::WT_UNDERSHIRT))) - { - gAgentWearables.removeWearable(type,false,index); - } -} +//void LLAgentWearables::userRemoveWearable(const LLWearableType::EType &type, const U32 &index) +//{ +// if (!(type==LLWearableType::WT_SHAPE || type==LLWearableType::WT_SKIN || type==LLWearableType::WT_HAIR || type==LLWearableType::WT_EYES)) //&& +// //!((!gAgent.isTeen()) && (type==LLWearableType::WT_UNDERPANTS || type==LLWearableType::WT_UNDERSHIRT))) +// { +// gAgentWearables.removeWearable(type,false,index); +// } +//} //static -void LLAgentWearables::userRemoveWearablesOfType(const LLWearableType::EType &type) -{ - if (!(type==LLWearableType::WT_SHAPE || type==LLWearableType::WT_SKIN || type==LLWearableType::WT_HAIR || type==LLWearableType::WT_EYES)) //&& - //!((!gAgent.isTeen()) && (type==LLWearableType::WT_UNDERPANTS || type==LLWearableType::WT_UNDERSHIRT))) - { - gAgentWearables.removeWearable(type,true,0); - } -} +//void LLAgentWearables::userRemoveWearablesOfType(const LLWearableType::EType &type) +//{ +// if (!(type==LLWearableType::WT_SHAPE || type==LLWearableType::WT_SKIN || type==LLWearableType::WT_HAIR || type==LLWearableType::WT_EYES)) //&& +// //!((!gAgent.isTeen()) && (type==LLWearableType::WT_UNDERPANTS || type==LLWearableType::WT_UNDERSHIRT))) +// { +// gAgentWearables.removeWearable(type,true,0); +// } +//} // static -void LLAgentWearables::userRemoveAllClothes() -{ - // We have to do this up front to avoid having to deal with the case of multiple wearables being dirty. - if (gAgentCamera.cameraCustomizeAvatar()) - { - // switching to outfit editor should automagically save any currently edited wearable - LLSideTray::getInstance()->showPanel("sidepanel_appearance", LLSD().with("type", "edit_outfit")); - } - userRemoveAllClothesStep2(TRUE); -} +//void LLAgentWearables::userRemoveAllClothes() +//{ +// // We have to do this up front to avoid having to deal with the case of multiple wearables being dirty. +// if (gAgentCamera.cameraCustomizeAvatar()) +// { +// // switching to outfit editor should automagically save any currently edited wearable +// LLSideTray::getInstance()->showPanel("sidepanel_appearance", LLSD().with("type", "edit_outfit")); +// } +// userRemoveAllClothesStep2(TRUE); +//} // static -void LLAgentWearables::userRemoveAllClothesStep2(BOOL proceed) -{ - if (proceed) - { - gAgentWearables.removeWearable(LLWearableType::WT_SHIRT,true,0); - gAgentWearables.removeWearable(LLWearableType::WT_PANTS,true,0); - gAgentWearables.removeWearable(LLWearableType::WT_SHOES,true,0); - gAgentWearables.removeWearable(LLWearableType::WT_SOCKS,true,0); - gAgentWearables.removeWearable(LLWearableType::WT_JACKET,true,0); - gAgentWearables.removeWearable(LLWearableType::WT_GLOVES,true,0); - gAgentWearables.removeWearable(LLWearableType::WT_UNDERSHIRT,true,0); - gAgentWearables.removeWearable(LLWearableType::WT_UNDERPANTS,true,0); - gAgentWearables.removeWearable(LLWearableType::WT_SKIRT,true,0); - gAgentWearables.removeWearable(LLWearableType::WT_ALPHA,true,0); - gAgentWearables.removeWearable(LLWearableType::WT_TATTOO,true,0); - } -} +//void LLAgentWearables::userRemoveAllClothesStep2(BOOL proceed) +//{ +// if (proceed) +// { +// gAgentWearables.removeWearable(LLWearableType::WT_SHIRT,true,0); +// gAgentWearables.removeWearable(LLWearableType::WT_PANTS,true,0); +// gAgentWearables.removeWearable(LLWearableType::WT_SHOES,true,0); +// gAgentWearables.removeWearable(LLWearableType::WT_SOCKS,true,0); +// gAgentWearables.removeWearable(LLWearableType::WT_JACKET,true,0); +// gAgentWearables.removeWearable(LLWearableType::WT_GLOVES,true,0); +// gAgentWearables.removeWearable(LLWearableType::WT_UNDERSHIRT,true,0); +// gAgentWearables.removeWearable(LLWearableType::WT_UNDERPANTS,true,0); +// gAgentWearables.removeWearable(LLWearableType::WT_SKIRT,true,0); +// gAgentWearables.removeWearable(LLWearableType::WT_ALPHA,true,0); +// gAgentWearables.removeWearable(LLWearableType::WT_TATTOO,true,0); +// } +//} // Combines userRemoveAllAttachments() and userAttachMultipleAttachments() logic to // get attachments into desired state with minimal number of adds/removes. diff --git a/indra/newview/llagentwearables.h b/indra/newview/llagentwearables.h index 04bd0b095f..20113bd075 100644 --- a/indra/newview/llagentwearables.h +++ b/indra/newview/llagentwearables.h @@ -172,7 +172,7 @@ private: void removeWearableFinal(const LLWearableType::EType type, bool do_remove_all /*= false*/, U32 index /*= 0*/); protected: static bool onRemoveWearableDialog(const LLSD& notification, const LLSD& response); - static void userRemoveAllClothesStep2(BOOL proceed); // userdata is NULL +// static void userRemoveAllClothesStep2(BOOL proceed); // userdata is NULL //-------------------------------------------------------------------- // Server Communication @@ -216,9 +216,9 @@ public: // Static UI hooks //-------------------------------------------------------------------- public: - static void userRemoveWearable(const LLWearableType::EType &type, const U32 &index); - static void userRemoveWearablesOfType(const LLWearableType::EType &type); - static void userRemoveAllClothes(); +// static void userRemoveWearable(const LLWearableType::EType &type, const U32 &index); +// static void userRemoveWearablesOfType(const LLWearableType::EType &type); +// static void userRemoveAllClothes(); typedef std::vector llvo_vec_t; From 3978e02c1fd85d0c93677e1bf94f8eab3998a294 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Tue, 7 Jun 2011 11:21:49 +0200 Subject: [PATCH 2/3] - fixed : no "unworn XXX" notification is sent when removing wearables from the inventory context menu (thankies Satomi) --HG-- branch : RLVa --- indra/newview/llappearancemgr.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 5e9bf72196..44d3a211e8 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -2873,6 +2873,10 @@ void LLAppearanceMgr::removeItemFromAvatar(const LLUUID& id_to_remove) LLAppearanceMgr::instance().removeCOFItemLinks(item_to_remove->getLinkedUUID(), false); gInventory.notifyObservers(); + +// [RLVa:KB] - Checked: 2011-06-07 (RLVa-1.3.1b) | Added: RLVa-1.3.1b + RlvBehaviourNotifyHandler::onTakeOff(pWearable->getType(), true); +// [/RLVa:KB] } } } From acdc3fce914249a824b6b3ce3266914daab240c4 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Tue, 7 Jun 2011 11:24:31 +0200 Subject: [PATCH 3/3] - fixed : @attach/detachXXX_except commands are misspelled (thankies Satomi) --HG-- branch : RLVa --- indra/newview/rlvdefines.h | 8 ++++---- indra/newview/rlvhelper.cpp | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/indra/newview/rlvdefines.h b/indra/newview/rlvdefines.h index 23d1a814b0..c342fea9f5 100644 --- a/indra/newview/rlvdefines.h +++ b/indra/newview/rlvdefines.h @@ -188,17 +188,17 @@ enum ERlvBehaviour { RLV_BHVR_ATTACHOVER, // "attachover" RLV_BHVR_ATTACHTHIS, // "attachthis" RLV_BHVR_ATTACHTHISOVER, // "attachthisover" - RLV_BHVR_ATTACHTHISEXCEPT, // "attachthisexcept" + RLV_BHVR_ATTACHTHISEXCEPT, // "attachthis_except" RLV_BHVR_DETACHTHIS, // "detachthis" - RLV_BHVR_DETACHTHISEXCEPT, // "detachthisexcept" + RLV_BHVR_DETACHTHISEXCEPT, // "detachthis_except" RLV_BHVR_ATTACHALL, // "attachall" RLV_BHVR_ATTACHALLOVER, // "attachallover" RLV_BHVR_DETACHALL, // "detachall" RLV_BHVR_ATTACHALLTHIS, // "attachallthis" - RLV_BHVR_ATTACHALLTHISEXCEPT, // "attachallthisexcept" + RLV_BHVR_ATTACHALLTHISEXCEPT, // "attachallthis_except" RLV_BHVR_ATTACHALLTHISOVER, // "attachallthisover" RLV_BHVR_DETACHALLTHIS, // "detachallthis" - RLV_BHVR_DETACHALLTHISEXCEPT, // "detachallthisexcept" + RLV_BHVR_DETACHALLTHISEXCEPT, // "detachallthis_except" RLV_BHVR_ADJUSTHEIGHT, // "adjustheight" RLV_BHVR_TPTO, // "tpto" RLV_BHVR_VERSION, // "version" diff --git a/indra/newview/rlvhelper.cpp b/indra/newview/rlvhelper.cpp index 8ee0cf52d3..8a22e28545 100644 --- a/indra/newview/rlvhelper.cpp +++ b/indra/newview/rlvhelper.cpp @@ -167,9 +167,9 @@ void RlvCommand::initLookupTable() "viewnote", "viewscript", "viewtexture", "acceptpermission", "accepttp", "allowidle", "edit", "editobj", "rez", "fartouch", "interact", "touchthis", "touchattach", "touchattachself", "touchattachother", "touchhud", "touchworld", "touchall", "touchme", "fly", "setgroup", "unsit", "sit", "sittp", "standtp", "setdebug", "setenv", "alwaysrun", "temprun", "detachme", - "attachover", "attachthis", "attachthisover", "attachthisexcept", "detachthis", "detachthisexcept", "attachall", - "attachallover", "detachall", "attachallthis", "attachallthisexcept", "attachallthisover", "detachallthis", - "detachallthisexcept", "adjustheight", "tpto", "version", "versionnew", "versionnum", "getattach", "getattachnames", + "attachover", "attachthis", "attachthisover", "attachthis_except", "detachthis", "detachthis_except", "attachall", + "attachallover", "detachall", "attachallthis", "attachallthis_except", "attachallthisover", "detachallthis", + "detachallthis_except", "adjustheight", "tpto", "version", "versionnew", "versionnum", "getattach", "getattachnames", "getaddattachnames", "getremattachnames", "getoutfit", "getoutfitnames", "getaddoutfitnames", "getremoutfitnames", "findfolder", "findfolders", "getpath", "getpathnew", "getinv", "getinvworn", "getgroup", "getsitid", "getcommand", "getstatus", "getstatusall"