Commit Graph

266 Commits (ae79bc0da2e01eb07f5adbb6ecfd4e9a66cd8501)

Author SHA1 Message Date
Tozh 019a7687ae //-TT Patch: "Wear Items" option in inventory to Replace Worn Items Only
- WIP
2011-03-08 08:15:44 -05:00
Arrehn 0586dca369 Merge up part2 to Release 2.4.0 + RLVa . Needs live testing 2011-01-19 12:40:31 -05:00
Arrehn cb3d43678b Catching up 2.4 merge effort with some late-committed changesets that slipped through.
NOTE: RLVa definitely broken, needs to be merged from catznip
2011-01-18 09:08:10 -05:00
Arrehn a30a9064b1 Merge Firestorm up to LL 2.4 Release. (initial pass)
RLVa needs additional merging
2011-01-18 00:50:43 -05:00
Arrehn bb04abd971 RLVa mergeup 2010-11-17 06:19:05 -08:00
Seth ProductEngine 024e5ff235 STORM-559 FIXED crash upon quitting the viewer while an outfit is being saved. 2010-11-09 00:55:44 +02:00
Seth ProductEngine 8a4b7c85c2 STORM-184 FIXED Disabled "Save" command for outfits without name (with "No Outfit" in My Appearance SP). 2010-10-29 22:31:21 +03:00
Kitty Barnett 3b5f07372b Merged with Appearance-Misc tip
--HG--
branch : RLVa
2010-10-07 23:58:27 +02:00
Kitty Barnett 14e2176803 Merged with Appearance-Misc tip
--HG--
branch : .RLVa
2010-10-07 23:57:46 +02:00
Kitty Barnett f07e11c79b - fixed : LLAppearanceMgr::syncCOF() shouldn't create links with the link target's description
-> ordering information is stored in a link's description so when linking to an item link we should use its description rather than its target's

--HG--
branch : RLVa
2010-10-07 21:20:47 +02:00
Kitty Barnett 33b505c0b3 - fixed : SyncAttach patch creates duplicate attachment links if COF hasn't been fetched yet
-> repro: clear cache + relog => isLinkInCOF() will always return false until we've actually fetched it => attachment link is created

--HG--
branch : Appearance-Misc
2010-10-05 13:59:14 +02:00
Kitty Barnett c821d1eadd Merged with Appearance-Misc tip
--HG--
branch : RLVa
2010-09-28 15:36:06 +02:00
Kitty Barnett 5bb2982998 Merged with Appearance-Misc tip
--HG--
branch : .RLVa
2010-09-28 15:34:48 +02:00
Kitty Barnett 1771dedd95 - fixed : LLAppearanceMgr::registerAttachment() fails to (re)add a link for worn attachments that aren't linked to in COF at log-on
--HG--
branch : Appearance-Misc
2010-09-28 15:27:28 +02:00
Kitty Barnett 7703091a2b Merged with Appearance-Misc tip
--HG--
branch : RLVa
2010-09-25 21:54:46 +02:00
Kitty Barnett d01cad6054 Merged with Appearance-Misc tip
--HG--
branch : .RLVa
2010-09-25 21:52:47 +02:00
Kitty Barnett c4624454f1 [Appearance/Misc]
- fixed : "Add to Outfit" and "Replace Outfit" already place the attachment links into COF and don't need to be tracked through mPendingObjLinks
- fixed : get_is_item_worn() shouldn't make the assumption that items in COFs are always worn

--HG--
branch : Appearance-Misc
2010-09-24 08:15:14 +02:00
Kitty Barnett c434dcafb2 Merged with branch point for SL-2.2.0 (Revision dc8ac597008a)
--HG--
branch : RLVa
2010-09-22 21:01:32 +02:00
Kitty Barnett 67ae7919c0 Merged with Appearance-MixedViewers tip
--HG--
branch : .RLVa
2010-09-22 20:56:40 +02:00
Kitty Barnett 27350cc8bc Merged with Appearance-Misc tip
--HG--
branch : .RLVa
2010-09-22 20:55:52 +02:00
Kitty Barnett a0f8962f26 [Appearance/MixedViewers]
- review : reviewed for SL-2.2.0

--HG--
branch : Appearance-MixedViewers
2010-09-22 19:36:41 +02:00
Kitty Barnett 6c32648b10 [Appearance/Misc]
- review : reviewed remaining changes for SL-2.2.0 and updated patch description

--HG--
branch : Appearance-Misc
2010-09-22 15:52:26 +02:00
Kitty Barnett 723e874e38 [Appearance/Misc]
- fixed : rewrote fix for http://jira.secondlife.com/browse/VWR-18512

--HG--
branch : Appearance-Misc
2010-09-22 08:06:03 +02:00
Kitty Barnett 60fca653aa [Appearance/Misc]
- fixed : multiple LLWearableHoldingPattern instances lead to "COF corruption"

--HG--
branch : Appearance-Misc
2010-09-22 04:12:23 +02:00
Kitty Barnett 9f8b7cceb5 [Appearance/Misc]
- changed : enable "Replace Current Outfit" on the base outfit if it's marked dirty

--HG--
branch : Appearance-Misc
2010-09-21 07:34:12 +02:00
Kitty Barnett 61baa570fb [Appearance/Misc]
- fixed : attachments that attach and then instantly detach don't have their COF link removed

--HG--
branch : Appearance-Misc
2010-09-18 08:56:08 +02:00
Kitty Barnett 7600b6a1d6 - fixed : force wearing fails to wear body parts (thankies Yan)
-> broken by LL in changeset 5d5bff8638ef where existing body parts are now favoured over those in the folder to be worn
    -> fix involves reverting to the old behaviour (new body part replaces existing one), might need to revisit at a later date

--HG--
branch : RLVa
2010-09-15 23:29:52 +02:00
Kitty Barnett f7ff27e313 Merged with default tip (Revision b8cd74d2bcc8)
--HG--
branch : RLVa
2010-09-15 23:22:10 +02:00
Kitty Barnett bd19da5acf Merged with Viewer-Build tip
--HG--
branch : .RLVa
2010-09-15 20:35:27 +02:00
Kitty Barnett 4052983a92 Merged with default tip (Revision b8cd74d2bcc8)
--HG--
branch : Appearance-MixedViewers
2010-09-15 20:25:59 +02:00
Kitty Barnett 410541f04e Merged with default tip (Revision b8cd74d2bcc8)
--HG--
branch : Appearance-Misc
2010-09-15 20:25:33 +02:00
Kitty Barnett cc18d3c32f Merged with Appearance-Misc tip
--HG--
branch : .RLVa
2010-09-06 22:21:21 +02:00
Kitty Barnett 91cd437a35 [Appearance/Misc]
- fixed : crash in LLAppearanceMgr::updateAppearanceFromCOF() due to "Appearance-SyncAttach" patch

--HG--
branch : Appearance-Misc
2010-09-04 04:07:40 +02:00
Kitty Barnett 7619bf972b - fixed : "Wear Replace" shouldn't be (silently) changed to "Wear Add" for clothing wearables
- fixed : "Wear Add" for attachments isn't properly supported in LLAppearanceMgr::wearItemOnAvatar()
- fixed : "wearable list" context menu options aren't visually disabled to reflect attachment/wearable restrictions/locks

--HG--
branch : RLVa
2010-09-04 02:22:38 +02:00
Kitty Barnett 48801314f5 - fixed : crash in LLAppearanceMgr::updateAppearanceFromCOF() due to "Appearance-SyncAttach" patch
-> fixed in "Appearance-Misc", local fix will dissapear on the next pmerge
- fixed : LLWearableBridge::removeAllClothesFromAvatar() doesn't remove all clothing from the avatar
    -> fixed in "Appearance-Misc", local fix will dissapear on the next pmerge

--HG--
branch : RLVa
2010-09-04 03:54:37 +02:00
Kitty Barnett e98e3d4efa - internal : moved "canDetach" checks from callers to LLVOAvatarSelf::detachAttachmentIntoInventory() instead
- internal : changed @detachme=force to use LLVOAvatarSelf::detachAttachmentIntoInventory()
- internal : fix-up for LLAppearanceMgr::removeItemFromAvatar() due to merging in Appearance-Misc patch branch

--HG--
branch : RLVa
2010-09-04 03:03:34 +02:00
Kitty Barnett f8a875db34 merge of .RLVa
--HG--
branch : RLVa
2010-09-02 22:18:51 +02:00
Kitty Barnett c670ff664e merge of Appearance-MixedViewers
--HG--
branch : .RLVa
2010-09-02 22:11:51 +02:00
Kitty Barnett 4edc5d9be1 merge of Viewer-Build
--HG--
branch : Appearance-Misc
2010-09-02 22:11:45 +02:00
Kitty Barnett 4b28e88299 merge of Viewer-Build
--HG--
branch : Appearance-MixedViewers
2010-09-02 22:11:40 +02:00
Kitty Barnett 436f3ba929 Merged with default tip (Revision b7f03886bbc7)
--HG--
branch : RLVa
2010-09-02 03:27:33 +02:00
Loren Shih 0440fe4dcc VWR-22695 FIXED Adding attachments messaging is inefficient
Single attachment request are now batched up and sent all at once as a single message.
2010-09-01 12:02:48 -04:00
Kitty Barnett 0477d49012 [Appearance/Misc]
- fixed : Add to/Replace Outfit removes newly worn attachments on completion
    -> additional fix for http://jira.secondlife.com/browse/VWR-18512
    -> copied over from RLVa since it's really just a viewer (appearance) bug

--HG--
branch : Appearance-Misc
2010-08-31 16:37:24 +02:00
Kitty Barnett d9e61bc4f9 - fixed : Add to/Replace Outfit removes newly worn attachments on completion
-> additional fix for http://jira.secondlife.com/browse/VWR-18512
    -> moved to Appearance-Misc branch as well, we'll remove it from RLVa as soon as we make RLVa dependant on it

--HG--
branch : RLVa
2010-08-31 16:33:37 +02:00
Kitty Barnett 646926e00b [Appearance/Misc]
- fixed : Add to/Replace Outfit removes newly worn attachments on completion
    -> (partial) fix for http://jira.secondlife.com/browse/VWR-18512
    -> copies over from RLVa since it's really just a viewer (appearance) bug

--HG--
branch : Appearance-Misc
2010-08-31 16:30:14 +02:00
Kitty Barnett 66d385232d - internal : added support for "force wear add" vs "force wear replace"
-> partial commit of support 'framework' *only* (completely untested so force wearing is probably very broken/non-functional right now)
    -> an (unintended) side-effect of the current implementation is that "nostrip" *wearables* won't get replaced on a force-replace wear, revisit later

--HG--
branch : RLVa
2010-08-31 00:38:29 +02:00
Kitty Barnett baa6794d0c [Appearance/Misc]
- fixed : LLAppearanceMgr::filterWearableItems() doesn't properly filter body parts
- fixed : LLWearableList::processGetAssetReply() creates multiple LLWearable instances for the same asset UUID
    -> fix for http://jira.secondlife.com/browse/VWR-20608
- changed : deprecated removeItemFromAvatar() in favour of having LLAppearanceMgr::removeItemFromAvatar() handle it directly/correctly
    -> wearables can't be worn/removed in 2.X without the viewer already having an LLWearable instance for it anyway
- added : InitialWearablesLoadedSignal signal which is emitted *once* when the initial wearables are loaded
- fixed : attachments sometimes detach only to instantly get reattached after logon
- added : LegacyMultiAttachmentSupport debug setting to route "secondary attachment points" to the primary attachment point
    -> maps secondary attachment point range [39,68] onto [1,30]
    -> only dislays "secondary attachment points" correctly for *other* avatars (by design)

--HG--
branch : Appearance-Misc
2010-08-28 20:40:14 +02:00
Kitty Barnett a24668392e [Appearance/MixedViewers]
- fixed : "Worn items in Viewer 2 and Viewer 1.x aren't synchronized" (http://jira.secondlife.com/browse/VWR-17594)
    -> current fix compares *only* the wearables in COF with the wearables specified by AgentWearablesUpdate
- fixed : minor memory leak in LLInitialWearablesFetch::processWearablesMessage()

--HG--
branch : Appearance-MixedViewers
2010-08-28 19:52:16 +02:00
Kitty Barnett e6e551cb41 Merged with default tip (Revision 7a739cbdce56)
--HG--
branch : RLVa
2010-08-28 02:06:00 +02:00
Vadim Savchuk 75a66a146b EXT-8727 FIXED Potential fix for a crash in LLAppearanceMgr::updateClothingOrderingInfo.
I couldn't reproduce the problem (it has happened for only two users, both running MacOSX),
but from what I see in the logs, it might have been caused by (or related to) NULL COF items.
I haven't found out how they appear nor what exactly causes the crash, but just for any
case I added a check to make sure we don't try to update wearables ordering info for such items.

Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/876/

--HG--
branch : product-engine
2010-08-26 18:59:08 +03:00