Commit Graph

111 Commits (5fa00a67af6364554c05eb3ca0339770fa6da455)

Author SHA1 Message Date
Igor Borovkov ccd0418ddf completed EXT-6719 Utilize the "description" field of outfit wearable links to store order information
- COF items get checked for correct ordering when COF is loaded (LLAppearanceMgr::updateAppearanceFromCOF..., LLAppearanceMgr::updateClothingOrderingInfo() ), and also when COF is saved to a new outfit, base outfit.
- wearables are arranged in LLAgentWearables in a proper order

* updateClothingOrderingInfo() [struggling with naming] does integrity checking and updates "invalid" items (items with wrong, gapped descriptions)
* moved LLAgentWearables::makeNewOutfitLinks(...) and LLShowCreatedOutfit  to a more natural place (llappearancemgr.cpp), because they use LLAppearanceMgr's methods a lot
* changed link_inventory_item(...), added the "new_description" parameter

Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/268/

--HG--
branch : product-engine
2010-04-21 12:43:03 +03:00
Tofu Linden 13fdc6e458 merge from PE's viewer-trunk 2010-04-14 09:46:37 +01:00
Loren Shih 85f54aca0f automated merge 2010-04-13 16:39:12 -04:00
Igor Borovkov 613b4e9361 done EXT-6675 Fix TRASH btn on Edit Outfit panel to remove an item from avatar (from COF)
Trash button removes from avatar a selected item only of "clothing" and "object" types

Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/209/

--HG--
branch : product-engine
2010-04-13 13:37:14 +03:00
Igor Borovkov cf31494b50 done EXT-6688 Implement Revert button funtionality (Edit Outfit panel)
On revert the base outfit is worn

Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/205/

--HG--
branch : product-engine
2010-04-09 15:19:11 +03:00
Igor Borovkov 43c85b0dfb done EXT-6716 Implement Add button functionality for adding a wearable to Current Outfit (Edit Outfit panel)
Added temporary PLUS button on the button bar under the top list of Edit Outfit panel

Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/203/

--HG--
branch : product-engine
2010-04-09 15:07:42 +03:00
Igor Borovkov 9d93441b31 done EXT-6687 Implement Save button functionality (Edit Outfit panel)
Implemented "Save", "Save as new" functionality. If the base outfit doesn't exist "Save as new" functionality is employed

Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/179

--HG--
branch : product-engine
2010-04-09 12:30:33 +03:00
Loren Shih c3d9316dff EXT-6727 : Allow LLInventoryObservers to target a single item (instead of a vector of items)
Added new constructors to LLInventoryFetch types to allow passing in a single item.
2010-04-06 17:30:23 -04:00
Brad Payne (Vir Linden) cec9bce226 Cleanup and consolidation 2010-04-01 18:18:00 -04:00
Brad Payne (Vir Linden) e45040412c Cleanup and consolidation 2010-04-01 17:26:25 -04:00
Brad Payne (Vir Linden) 39308422f1 Cleanup and consolidation 2010-04-01 17:05:25 -04:00
Nyx (Neal Orman) 98695056c2 Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk 2010-03-30 16:49:35 -04:00
Loren Shih 909091cc0c EXT-3415 : INFRASTRUCTURE : Move LLInventoryCollectFunctors to separate class
Moved all the LLInventoryModelCOllectFunctors from LLInventoryModel to LLInventoryFunctions
2010-03-30 15:56:15 -04:00
Nyx (Neal Orman) cc3f4c1f59 Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk 2010-03-30 15:20:37 -04:00
Nyx (Neal Orman) dbcd12a4d1 EXT-6633 enable basic multiwearables demo
Fixed several areas of code that were not multi-wearables enabled.
Specifically allowed for the wearing of created outfits that had links to
multiple items of the same type. Such outfits can be created by dragging
multiple items of the same type into an unworn outfit folder. When you
wear the outfit, all items (up to 5 per type) should be worn. Does not
affect right-click options or other buttons.

Code reviewed by Vir.
2010-03-30 15:17:14 -04:00
Loren Shih 114e5ca083 EXT-5940 : Typedef all vector<LLUUID>'s
Superficial cleanup to change all typedef std::vector<LLUUID> to use a common typedef uuid_vec_t instead.
2010-03-29 16:33:35 -04:00
Loren Shih b6e7850c0a Merge 2010-03-29 12:30:09 -04:00
Loren Shih 94e6e10739 EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup to replace all instances of "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject" with "gAgentAvatar".
2010-03-29 12:00:26 -04:00
Brad Payne (Vir Linden) b2a667b722 For EXT-4666: changed LLGestureManager to LLGestureMgr throughout 2010-03-29 11:10:54 -04:00
Brad Payne (Vir Linden) 4ff53b9066 For EXT-4666: changed LLAppearanceManager to LLAppearanceMgr throughout 2010-03-29 11:02:39 -04:00
Brad Payne (Vir Linden) 783eb286a6 merge 2010-03-29 10:53:22 -04:00
Brad Payne (Vir Linden) f428d62c93 Moved some logic into LLWearableHoldingPattern 2010-03-19 17:15:41 -04:00
Brad Payne (Vir Linden) 2b4158c4a0 cleaning up dead code, comments 2010-03-19 15:38:23 -04:00
Brad Payne (Vir Linden) b84b0e71c1 For EXT-4173, EXT-5871, EXT-3812: increased timeout for wearable asset fetches from 20 seconds to 60 seconds. Reviewed by Nyx 2010-03-19 11:23:51 -04:00
Loren Shih ba414d500c automated merge viewer2.0->viewe2.0 2010-03-16 10:19:37 -04:00
Loren Shih 43f1abee2b EXT-6367: Can't delete non-links from COF
EXT-6372 : Can waer non-links in COF

Some minor changes to account for non-link items appearing in the COF (non-links shouldn't appear in COF, but this can happen due to bugs or 1.23 usage).
First fix allows for these items to be deleted.
Second fix ignores these items from being processed/worn.
2010-03-15 17:43:17 -04:00
Brad Payne (Vir Linden) 779844f73a For EXT-5333: Bodyparts missing from appearance and COF. Recovered wearables were failing to get added correctly due to wrong timeout logic. Reviewed by Nyx. 2010-03-11 17:50:14 -05:00
Brad Payne (Vir Linden) 2a79cc287d For EXT-6247. Log file spam cleanup 2010-03-09 09:31:11 -05:00
Loren Shih 6ebc1d8858 EXT-5547 : Autopopulation broken due to new web deploy accounts
EXT-5673 : Autopopulation: Created outfits copy subfolder contents as well as immediate folder contents
EXT-5632 : Autopopulation is including subfolders even if those aren't outfits
DEV-46683 : Post-Deployment Cleanup

This is a series of changes to fix autopopulation behavior that was broken due to the new surprise web avatar deploy.  That deploy surfaced a number of serious issues with the original AP code.  I did not write this code and the person who did is no longer here, so I've done my best to fix those issues up.
This is a fairly comprehensive set of changes, but it's necessary given the poor state of the pre-existing code and how many problems it caused the new web avatar deploy.

This new version of the AP code will:
(1) Look for a Library->Clothing->Initial Outfits folder and use that if it exists
(2) Not create outfits out of folders that aren't complete outfits
(3) No longer string match against "More Outfits" in order to ignore outfits
(4) No longer recursively collect folder contents when creating an outfit (i.e. will only look at direct descendents)
2010-03-02 19:56:28 -05:00
Tofu Linden 1394d21b7a CID-436
Checker: NULL_RETURNS
Function: RecoveredItemCB::fire(const LLUUID &)
File: /indra/newview/llappearancemgr.cpp
2010-03-02 09:53:52 +00:00
Tofu Linden ac7539bd68 CID-437
Checker: REVERSE_INULL
Function: RecoveredItemLinkCB::fire(const LLUUID &)
File: /indra/newview/llappearancemgr.cpp
2010-03-02 09:50:09 +00:00
Brad Payne (Vir Linden) 8e5d95cba8 For EXT-5333: Bodyparts missing from appearance and COF. createStandardWearables() now COF-based 2010-02-25 10:59:59 -05:00
Brad Payne (Vir Linden) 00fdc0acd5 Work in progress on EXT-5333: Cleanup. 2010-02-22 14:03:29 -05:00
Brad Payne (Vir Linden) 626049851d Work in progress on EXT-5333: Bodyparts missing from appearance and COF 2010-02-19 17:39:03 -05:00
Brad Payne (Vir Linden) 284eb11a10 Work in progress on EXT-5333: Bodyparts missing from appearance and COF 2010-02-18 16:10:35 -05:00
Brad Payne (Vir Linden) 2aacee62ad Work in progress on EXT-5333: Bodyparts missing from appearance and COF 2010-02-17 18:17:48 -05:00
Brad Payne (Vir Linden) dc8a9dc57d merge 2010-02-12 13:46:21 -05:00
Brad Payne (Vir Linden) 1e76fc2b1f Log spam cleanup 2010-02-12 13:44:32 -05:00
Brad Payne (Vir Linden) a3d8338cdc For EXT-5259: Major regression in load time for new users from 1.23 to 2.0. Moved autopopulate to after avatar appearance resolves 2010-02-12 13:12:26 -05:00
Eric M. Tulla (BigPapi) 39fe664b97 Minor clarification edit to a warning comment. 2010-02-11 11:09:08 -05:00
Eric M. Tulla (BigPapi) 71ae50c56b EXT-4387 - Possible fix. No repro, but added an extra safety check and warning the only place in the function that it appears that something could go wrong
if we have inventory corruption and InventoryType is wearable but the wearable type bitfield is in a broken state.
-Reviewed by vir.
2010-02-11 11:06:42 -05:00
Brad Payne (Vir Linden) 8332550c6d Temporary diagnostics 2010-02-08 18:37:35 -05:00
Brad Payne (Vir Linden) 5dda2516ad merge 2010-02-08 09:50:04 -05:00
Brad Payne (Vir Linden) f5b82a3772 For EXT-4919: Initial gesture setup is wrong for new users. Added a template-y mechanism for roundtripping an inventory fetch - hopefully could replace some gratuitous classes elsewhere as well. 2010-02-05 18:44:35 -05:00
Brad Payne (Vir Linden) d8f0bc021f For EXT-4919: Initial gesture setup is wrong for new users. Checkpointing work in progress. 2010-02-05 16:37:23 -05:00
Loren Shih 14d77a36d4 EXT-4993 : Deleting an item from the COF in Inventory Floater keeps it worn
EXT-4997 : Centralize right-click menu options for delete/remove link
EXT-4998 : Automatically reject double separators from right click menu

Disabled/hid delete button from COF right-click menu, also means that trash icon is disabled.
Added generalized function to remove consecutive separators from right-click menu.
Made a minor cosmetic change to have all code duplication for adding "delete" menu item instead call a common function.
2010-02-04 18:38:47 -05:00
Brad Payne (Vir Linden) d2d1920609 For EXT-4855: Crash on onWearableAssetFetch. Prevent late-arriving wearables from touching a deleted object. 2010-02-04 10:20:31 -05:00
Eric M. Tulla (BigPapi) 9df8583ea8 Moss rocks! Thanks for noticeing the paste error that resulted in a double \'\!\' bool op. 2010-02-03 14:01:36 -05:00
Eric M. Tulla (BigPapi) 594b1ac679 EXT-4868: Callback was getting triggered at shutdown, leading to crash. Now test isExiting() first.
-Reviewed by vir
2010-02-03 11:42:03 -05:00
Nyx (Neal Orman) 6e7ead6f4f EXT-4075 BTEST-129 switching wearables makes you temporarily naked
When switching from one pair of pants to another we were temporarily using
an in-between state without pants as a valid rendering state. Removed a call
to removeWearable to keep your pants on until the update from COF swaps the old
pair of pants for the new. Lower body is redrawn only once lowest discard level
of new pants arrives.

Code reviewed by Bigpapi
2010-02-01 15:47:15 -05:00