Commit Graph

90 Commits (e92d3dcf1013ab340fdef514b41ebf790f79e04c)

Author SHA1 Message Date
Oz Linden 634f152004 merge up to latest viewer-development 2011-02-08 11:57:38 -05:00
Vadim ProductEngine ec0eafbaa0 STORM-348 FIXED "Edit" and "Lock" buttons appearing on body part items in outfit editor before they are hovered with mouse.
Added buttons reshaping code that exists in postBuild() methods of the other LLPanelWearableListItem descendants.
2011-01-19 21:41:53 +02:00
Loren Shih 63c504e4b0 Fix for bad merge error. 2010-08-26 12:37:43 -04:00
Loren Shih a8f40db049 EXT-8751 FIXED "Create new" in Edit Outfit doesn't actually check if you can legally create a new item
Create New now makes sure you haven't exceeded max wearables.
Also took out debug camera hack.
2010-08-26 11:59:19 -04: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
Loren Shih 981a43b355 Created new wearable type.
Added debug setting for disabling physics.
Added disable-multiwear and disable-camera-reset to wearabletype.
2010-08-23 16:13:10 -04:00
Andrew Dyukov 6c4b0f82bc EXT-8635 FIXED Replaced "no matches found" with "Loading..." in the My Outfits tab.
Set no items text to "Loading..." when creating the wearable items list and to "There are no items in this outfit" when category is complete.
"Outhfit" is there, because wearable items list nay be empty only for them. This string was introduced, because the only situation when there are
no items shown in outfit tab is for empty outfit- because even when applying filter either all items from outfit will be shown or outfit tab won't be shown at all.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/865/

--HG--
branch : product-engine
2010-08-19 15:09:07 +03:00
Tofu Linden b5a8534116 (final?) hairy merge from viewer-release to viewer-public 2010-08-17 11:41:12 -07:00
Sergei Litovchuk ef46496775 EXT-8636 FIXED updating wearables (worn) prefix in 'My Outfits' list.
- Fixed LLOutfitsList COF changes handler to update worn status of items removed from COF. Now they are updated based on the differences in original items' ids in COF.
- Fixed 'My Outfits' items worn status check to update depending on whether the item is linked in COF or not.
This is a kind of workaround to fix updating attachments' worn status because LLAppearanceMgr::updateAppearanceFromCOF is triggered erlier than new attachment links are fetched. When dumpItemArray(obj_items,"asset_dump: obj_item") is called from LLAppearanceMgr::updateAppearanceFromCOF, all attachment links have empty asset ids.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/859/.

--HG--
branch : product-engine
2010-08-16 23:23:48 +03:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Tofu Linden c574a819ec Fix a bunch of typos in new enums, one of which was causing a build failure. 2010-08-12 14:20:33 +01:00
Tofu Linden 98870dfa24 merge from viewer-release 2010-08-12 12:53:53 +01:00
Paul Guslisty 7a0b016c8c EXT-8205 FIXED (Items in \"Add more\" panel are not sorted by name)
- Modified LLWearableItemTypeNameComparator so that it can be more reusable and adjustable

- Set LLWearableItemTypeNameComparator for WearableItemsList ('List view' of 'Add More' panel) due to sort clothings by name

- Modified and applied patch form https://codereview.productengine.com/secondlife/r/620/diff/2/#index_header. This patch was discarded because specification was changed

Restored diff after bad merge at 13817

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/765/

--HG--
branch : product-engine
2010-08-12 13:48:36 +03:00
Vadim Savchuk 554d543b02 EXT-8577 FIXED Context menu items for multi-attachments
Changes:
* Implemented bulk-add from My Appearance SP.
* Made 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).
  I stated that in comments.

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

--HG--
branch : product-engine
2010-08-09 18:10:36 +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
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
Sergei Litovchuk e5b33c31c3 EXT-7676 FIXED Restored fix (47df1b3fd94e) reverted in merge 5b5cc4a8642d with slight modifications.
- Replaced pointers passed to 'Add More' gear menu with LLHandle.
- Removed storing 'Add More' panel sort order from settings because the order is changed each time the panel opens.
- Replaced creating items comparator in LLPanelOutfitEdit::postBuild() with a static comparator in llwearableitemslist.cpp.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/826/.

--HG--
branch : product-engine
2010-08-02 20:52:17 +03: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
Alexei Arabadji 44ac59ac1c EXT-7015 ADDITIONAL FIX Updated condition of hiding wear related context menu entries from "hide if all can't be worn" to "hide if any can't be worn".
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/813/

--HG--
branch : product-engine
2010-07-28 18:27:09 +03:00
Tofu Linden b6804a855b merge from PE's viewer-trunk 2010-07-28 10:35:59 +01:00
Richard Linden 28bd15d47d Merge from dessie/viewer-release 2010-07-27 14:44:17 -07:00
Richard Linden 15247f0869 Backed out changeset: 58571b4e704b 2010-07-27 14:22:14 -07:00
Alexei Arabadji 431a6771cc Performed necessary refactoring after merge rev. 14093:babb41195f70
--HG--
branch : product-engine
2010-07-27 18:00:37 +03:00
Mike Antipov a4fcfb1530 Merge with head.
Resolved conflict in indra/newview/lloutfitslist.cpp to use changes from viewer-release.
Rejected changes in that file coming with 10f02c59761c (EXT-7015 FIXED Avoided wearing item moved to trash.) It will be refixed in a separate commit.

--HG--
branch : product-engine
2010-07-27 16:46:37 +03:00
Alexei Arabadji 092d49cb3a EXT-7015 FIXED Avoided wearing item moved to trash.
Details:
Disabled wear button and hidden related context menu entries if base object of inventory link is in trash.

reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/806/

--HG--
branch : product-engine
2010-07-27 15:59:11 +03:00
Tofu Linden 400f7db2d9 Conflict resolution. Erring on the side of viewer-release. 2010-07-26 14:01:45 +01:00
Tofu Linden 44d0fd81ee (hairy) merge from viewer-release 2010-07-26 10:34:39 +01:00
Brad Payne (Vir Linden) d9f01a7c5a Fixed reversal of replace/add logic with clothing 2010-07-23 16:24:17 -04:00
Tofu Linden 87ae9a5190 merge from PE's viewer-release 2010-07-22 08:54:12 +01: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
Paul Guslisty 258f67cd02 EXT-8205 FIXED (Items in \"Add more\" panel are not sorted by name)
- Modified LLWearableItemTypeNameComparator so that it can be more reusable and adjustable
- Set LLWearableItemTypeNameComparator for WearableItemsList ('List view' of 'Add More' panel) due to sort clothings by name
- Modified and applied patch form https://codereview.productengine.com/secondlife/r/620/diff/2/#index_header. This patch was discarded because specification was changed

Reviewed by Mike Antipov and Vadim Savchuk at https://codereview.productengine.com/secondlife/r/765/

--HG--
branch : product-engine
2010-07-21 17:03:00 +03:00
Richard Nelson fde4edf75d merge 2010-07-20 11:31:23 -07:00
Dessie Linden 5d85dad85f Reverted changeset 2bb10eae42bf 2010-07-15 12:31:08 -07:00
Vadim Savchuk ba1123e3e4 Manual merge from default branch
Resolved conflicts in llpaneloutfitedit.cpp

--HG--
branch : product-engine
2010-07-13 18:54:16 +03:00
Loren Shih c535693535 EXT-8333 FIXED 'Add more': 'Wear' item remains enabled in context menu of worn object
Simple logic fix so that worn objects son't have add/wear option.
2010-07-12 17:32:03 -04:00
Vadim Savchuk d07a354d0a Merge from default branch
--HG--
branch : product-engine
2010-07-12 14:38:45 +03:00
Richard Linden 5b1386e5b6 merge 2010-07-09 14:30:49 -07:00
Richard Linden 1f79bee86e EXT-8237 FIX Opening up Edit Outfit- Add More->Shirt causes FPS to drop from 60fps to 18fps for a really long time
EXT-8235 FIX HUGE long delay when reopening and/or closing edit outfit sidepanel if "Add More..." is active
EXT-7695 FIX UI lockup after add wearable, right click av -> Change Outfit

reviewed by Vir
2010-07-09 14:26:56 -07:00
Tofu Linden 467a8b0441 merge from PE's viewer-release 2010-07-09 09:40:18 +01: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
Vadim Savchuk 417b98eae1 EXT-8170 ADDITIONAL FIX Now using complete translatable sentences like "Create new shoes", "Create new pants", etc as labels for AE context menus.
Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/716/

--HG--
branch : product-engine
2010-07-08 19:21:00 +03:00
Vadim Savchuk 222cd49ad5 Merge from default branch
--HG--
branch : product-engine
2010-07-08 14:32:45 +03:00
Vadim Savchuk 510958f6c4 Merge from default branch
--HG--
branch : product-engine
2010-07-05 16:55:05 +03:00
Tofu Linden d3060e64a2 merge from PE's viewer-release. conflicts resolved. 2010-07-03 10:49:07 +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
Alexei Arabadji 018ff76192 EXT-8127 FIXED Provided attachment list item name on outfit edit panel even if it unworn.
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/688/

--HG--
branch : product-engine
2010-07-02 17:41:42 +03:00
Loren Shih 651bc81ffc EXT-8128 FIXED Right click menu should offer "wear" if no item of type is worn 2010-06-30 16:42:09 -04:00
Sergei Litovchuk ad4002caea EXT-7676 FIXED Added items sorting from gear menu for 'Add Wearable'.
- Added new gear menu when 'Add Wearable' panel is open in 'Edit Outfit'.
- Added wearable items list comparator to sort by wearable creation date.
- Added storing sorting type in viewer settings.

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

--HG--
branch : product-engine
2010-06-29 20:07:33 +03:00