Commit Graph

221 Commits (17854c4e8702febaa8fe4adfbc678f9abaaa52c7)

Author SHA1 Message Date
Vadim ProductEngine 05c14aa558 STORM-702 FIXED Made it possible to wear partial outfits
Enabled the "Replace Current Outfit" option for incomplete outfits (i.e. those that don't contain full set of body parts).
2011-01-04 13:52:29 +02:00
Richard Linden 50d21a75a7 merge 2010-11-15 15:52:54 -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
callum a0e3c4380d EXP-271 FIX Implement slapp functionality for changing avatars 2010-10-21 16:55:15 -07: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
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
Tofu Linden e416840f85 Backed out changeset c3d41f18ce2b
back-out the back-out for this branch.  yay.
2010-08-24 19:22:00 +01:00
Tofu Linden 98cc236503 Backed out changeset a62bf7c0af21
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00
Tofu Linden b5a8534116 (final?) hairy merge from viewer-release to viewer-public 2010-08-17 11:41:12 -07:00
Brad Payne (Vir Linden) d77c3e3600 merge 2010-08-13 14:39:04 -04:00
Loren Shih f369ebec24 EXT-8650 Can wear multiple copies of no-copy item via object links
* EXT-8661 Take out unused mRegisteredAttachments in LLAppearanceMgr

Removed unused mRegisteredAttachments.  Not sure what this was used for, but it's no longer used.
2010-08-13 11:26:22 -04:00
Loren Shih 5881252ab2 EXT-8650 Can wear multiple copies of no-copy item via object links
* EXT-8688 Automatically detach same object is detected
* EXT-8689 Cleanup detachAttachmentIntoInventory code

When an object arrives as an attachment, if it's already attached then it's automatically detached.
2010-08-13 11:12:51 -04:00
Tofu Linden 7f08555143 merge from viewer-release 2010-08-13 12:40:45 +01:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Brad Payne (Vir Linden) 6c1796c105 DEV-52580 WIP: disallow multiple links to the same attachment in updateAppearanceFromCOF() 2010-08-12 11:00:39 -04:00
Vadim Savchuk 5de5510f58 EXT-8629 FIXED Enable the Wear button in My Outfits for outfits that are subsets of the current outfit.
We allowed wearing any outfit that contains non-worn items.
Now it appears to be wrong, therefore and I changed condition so that
we allow wearing any outfit (or folder) that contains the full set of body parts.

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

--HG--
branch : product-engine
2010-08-12 16:13:48 +03:00
Vadim Savchuk 62466c0704 EXT-8577 WIP Context menu items for multi-attachments.
Done:
- 1. Dropped the obsolete "MultipleAttachments" setting.
- 2. Added an "Add" item to the following attachment-related context menus:
     * My Appearance (ex-My Outfits) context menu.
     * Edit Outfit -> Add More context menu.
     * Object in-world context menu.
     * Inventory context menu.
     * Object inspector gear menu.
- 3. Modified "Attach To / Attach To HUD" to perform the "add" instead of "replace" action.

TODO:
- Ability to attach multiple objects at once from the Add More panel (bulk attach).
- Make sure there's no memleak when you click Wear/Attach in the in-world object context menu
  and the callback isn't invoked (because e.g. avatar fails to get close enough to the object).

Issues:

0. I'm not sure whether LLAgentWearables::userAttachMultipleAttachments()
   should replace attachments or add them. Assumed the former.

1. I couldn't verify that adding objects from the object inspector menu works
   because I either could wear an object or see its inspector, not both.

2. > 1. Right-click on an object in your inventory and select "Wear".
   > VERIFY: Attaches the object and replaces whatever's there; asks for
   > confirmation before replacing an existing object.
   I think this is impossible to implement because we don't know in advance
   what point the object will be attached to, so we can't display a confirmation dialog.

Reviewed by Seraph at https://codereview.productengine.com/secondlife/r/843/

--HG--
branch : product-engine
2010-08-06 17:14:01 +03:00
Tofu Linden 4e966c1b15 merge from viewer-release 2010-08-04 12:21:34 +01:00
Vadim Savchuk 4b00b98844 EXT-8534 FIXED Fixed the 'Wear' in My Outfits being disabled for outfits consisting of body parts only.
Changed the condition to enable the "Wear" button in My Outfits and the corresponding item in the outfit context menu.
They now get enabled for any outfit that isn't the base outfit and contains non-worn wearables.

By the way, did a minor cleanup: moved an LLAgentWearables.isCOFChangeInProgress() call to LLAppearanceMgr::getCanAddToCOF() to avoid code duplication.

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

--HG--
branch : product-engine
2010-08-03 23:28:51 +03:00
Christian Goetze (CG) 6a1fefac22 Redo the same merge as in changeset "2026f824953f", but this time with feeeeling. 2010-08-02 16:59:20 -07:00
Kent Quirk 19c0d6d4ea Merge from q/viewer-release to dessie/viewer-release for 2.1.1 beta 1 2010-07-30 10:11:55 -04:00
Richard Linden 15247f0869 Backed out changeset: 58571b4e704b 2010-07-27 14:22:14 -07:00
Vadim Savchuk 7598015945 EXT-8491 FIXED Crash in LLAppearanceMgr::addCOFItemLink().
Reason:
When you click on a clothing link in COF, LLAppearanceMgr::wearItemOnAvatar() removes
all COF links of the clicked wearable type -- thus invalidating all previously
obtained LLViewerInventoryItems for those links -- and then passes such an
invalid item (item_to_wear) to addCOFItemLink() which of course crashes.

Fix:
1. Handle this case in wearItemOnAvatar(): don't try wearing COF items.
2. Disable the Wear button in the inventory SP when a COF item is selected.
3. Fixed get_can_item_be_worn() to return FALSE for items which are in COF or have links in COF.

Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/811/

--HG--
branch : product-engine
2010-07-27 22:34:34 +03:00
Tofu Linden fe91462d62 merge from PE's viewer-release 2010-07-26 10:07:35 +01:00
Alexei Arabadji 2e9671a8a8 EXT-8329 FIXED Provided disabling 'Wear Item' button after item was worn.
Details:
1 Updated condition is item can be worn considering situation when item is copied in COF but is not worn.
2 Avoided code duplication in method LLOutfitsList::canWearSelected()

reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/785/

--HG--
branch : product-engine
2010-07-26 10:33:43 +03:00
Brad Payne (Vir Linden) ee40479c3d Removed a bunch of templates and inlining through the miracle of boost::function 2010-07-23 16:22:20 -04:00
Brad Payne (Vir Linden) 35837f2d38 EXT-8153 FIX - modified replace logic when wearing multiple items 2010-07-22 11:11:22 -04:00
Tofu Linden 77c3a65db6 merge from viewer-release 2010-07-28 10:37:06 +01:00
Richard Linden 28bd15d47d Merge from dessie/viewer-release 2010-07-27 14:44:17 -07:00
Brad Payne (Vir Linden) c3973a4895 EXT-8135 FIX - use LLUpdateAppearanceOnDestroy callback to postpone appearance update until all links are created 2010-07-21 15:28:28 -04:00
Brad Payne (Vir Linden) 1dae91d735 EXT-8360 WIP - propagating COF item name changes various places 2010-07-19 17:15:32 -04:00
Dessie Linden 5d85dad85f Reverted changeset 2bb10eae42bf 2010-07-15 12:31:08 -07:00
Tofu Linden c8602b2935 merge from PE's viewer-release 2010-07-13 09:22:06 +01:00
Nyx (Neal Orman) 2630252a9f EXT-8151 FIX multi-selection breakage
Original patch merged poorly with a coverity cleanup, resulting in us not
passing the callback on to the proper functions for clothing (we did for
bodyparts). Added the callback and wearing clothing works again!

Code reviewed by Monroe
2010-07-12 16:22:48 -04:00
Sergei Litovchuk f790036002 EXT-8190 PARTIAL FIX Fixed loading indicator infinite spins upon pressing 'Save' for outfit with non-link items.
- Added inventory collector functor to select items by their actual type.
- Fixed outfit "dirtiness" calculation so only link items are checked.

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

--HG--
branch : product-engine
2010-07-10 00:34:36 +03:00
Nyx (Neal Orman) adfa188cee Automated merge with ssh://hg.lindenlab.com/q/viewer-release/ 2010-07-08 17:53:48 -04:00
Nyx (Neal Orman) 6f2118432d EXT-8279 FIX original items being deleted when removed from COF
Replacing logic with call to removeCOFItemLinks, which should do appropriate
checking to determine that item is in the COF and is actually a link.

Code reviewed by Seraph
2010-07-08 17:53:32 -04:00
Monroe Linden bfb66a8b94 Fix for EXT-8151
Made LLPanelOutfitEdit::onPlusBtnClicked() iterate over all selected items and wear each one.  Also made it create one LLUpdateAppearanceOnDestroy and pass it to all calls to wearItemOnAvatar.

Add optional callback argument (as LLPointer) to wearItemOnAvatar, addCOFItemLink, LLDeferredCOFLinkObserver

Reviewed by Nyx at http://codereview.lindenlab.com/2482033
2010-07-08 14:13:26 -07:00
Tofu Linden ca5e05a5c7 merge from PE's viewer-public 2010-07-08 10:14:00 +01:00
Brad Payne (Vir Linden) f3a8087de6 merge 2010-07-07 17:23:26 -04:00
Nyx (Neal Orman) e50692ef4b SNOW-704 EXT-8267 FIX Crash on login for invalid inventory wearable type data
Used to assert that the inventory's stored wearable type data matched the
asset's stored wearable type, leading to a crash when these did not line up.
Converted the assert to a check with llwarns for when this happens.

code reviewed by vir
2010-07-07 17:03:43 -04:00
Brad Payne (Vir Linden) 3ca975740f EXT-8234 FIX - reduced log spam quite a bit; rest is arguably still useful for diagnosing the not-uncommon problems encountered during outfit changes 2010-07-07 16:13:20 -04:00
Alexei Arabadji d68b8ce269 EXT-8154 FIXED Forced removing garbage items from COF.
reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/687/

--HG--
branch : product-engine
2010-07-07 18:35:14 +03:00
Nyx (Neal Orman) 9d96da4b94 EXT-8249 FIX coverity fix - eliminating fallthrough for switch statement
Code reviewed by Seraph
2010-07-06 12:44:43 -04:00
Tofu Linden 1ff3534521 CID-499
Checker: FORWARD_NULL
Function: LLAppearanceMgr::dumpItemArray(const LLDynamicArray<LLPointer<LLViewerInventoryItem>, (int)32> &, const std::basic_string<char, std::char_traits<char>, std::allocator<char>>&)
File: /indra/newview/llappearancemgr.cpp
2010-07-05 12:17:54 +01:00
Nyx (Neal Orman) e78f96b2fb EXT-8213 FIX users cannot replace their shape if it does not load
Removed checking for wearables loaded on replacing or adding individual items.
After reviewing the code in depth, we believe this is safe to do,
particularly since we allow the user to replace their outfit from the same state.

Filed a followup issue for later investigation EXT-8231

Code reviewed by Vir and Seraph
2010-07-02 15:55:49 -04:00
Brad Payne (Vir Linden) ddf87b874a merge 2010-07-01 16:55:19 -04:00
Brad Payne (Vir Linden) 5cda3ccad7 EXT-8194 FIX - added textures for default avatar wearables and attachments 2010-07-01 14:08:25 -04:00