Commit Graph

67 Commits (e92d3dcf1013ab340fdef514b41ebf790f79e04c)

Author SHA1 Message Date
Jonathan Yap 9134ec0197 STORM-899 'No attachments worn' text on blank 'Attachments' accordion remains in English for all locales 2011-06-07 16:43:38 -04:00
Jonathan Yap bf8b02b1f3 STORM-899 'No attachments worn' text on blank 'Attachments' accordion remains in English for all locales 2011-05-26 09:17:14 -04:00
Vadim Savchuk c331607d97 STORM-185 FIXED Don't reset accordions in the Outfit Edit panel when a wearable gets worn.
The fix consists of two parts:
1. Saving/restoring scrollbar position when refreshing the clothing/attachments/bodyparts lists
   (the lists get refreshed on COF change).
2. Not resetting expanded accordion tab upon wearing an item (which was introduced with the fix of EXT-8164).

So, apart from preserving scrollbar position (which is what the bug reporter requests),
I also fixed that when you wear something, the Clothing accordion was always expanded.
2010-09-16 22:01:40 +03:00
Paul Guslisty 9789192275 VWR-22723 Add More category picker defaults whenever a clothing item is removed
- After wearable removed from COF list, check: whether any outfit of the same wearable type as removed left in COF. If left then select it.
- Added method selectClothing(LLWearableType::EType) to the LLCOFWearables that selects first clothing from COF of specified WearableType

Reviewed by Vadim Savchuk
2010-08-31 19:42:46 +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
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Tofu Linden b68f753a75 (hairy) merge from viewer-release 2010-08-05 12:42:12 +01:00
Brad Payne (Vir Linden) e6d5cc3bd1 EXT-8283 FIX, EXT-8360 FIX - original fixes got broken, presumably during some merge 2010-08-04 17:21:33 -04:00
Tofu Linden 4e966c1b15 merge from viewer-release 2010-08-04 12:21:34 +01:00
Paul Guslisty e3a33b068d EXT-8284 FIXED ('Add More' panel items aren't sorted by clothing type after it was opened by 'Replace' item of context menu)
Restored from BAD MERGE at 5b5cc4a8642d

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

--HG--
branch : product-engine
2010-08-04 11:38:29 +03:00
Richard Nelson 39965cf6e8 merge from dessie/viewer-release 2010-08-02 19:45:35 -07: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
Richard Nelson 76a9c1214f merge 2010-07-30 10:07:14 -07:00
Richard Nelson 147bc94274 changed to use childSetAction without void* argument 2010-07-30 09:57:52 -07:00
Richard Linden 28bd15d47d Merge from dessie/viewer-release 2010-07-27 14:44:17 -07: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
Andrew Polunin a96f47db68 EXT-8164 FIXED (Accordions should be reset to default state after Edit Outfit panel reopening)
Now accordion on panels 'Edit Outfit', 'Editing Shape', 'Editing Hair', 'Editing Eyes', 'Editing Skin', 'Group Profile' and 'Place Profile' are reset when the panels are closed and then opened again.

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

--HG--
branch : product-engine
2010-07-21 19:00:57 +03:00
Richard Nelson fde4edf75d merge 2010-07-20 11:31:23 -07:00
Brad Payne (Vir Linden) 06aa2322b2 EXT-8360 FIX - cleanup 2010-07-20 11:21:18 -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
Paul Guslisty 439905e983 EXT-8284 FIXED ('Add More' panel items aren't sorted by clothing type after it was opened by 'Replace' item of context menu)
- Set proper callback for 'Replace' clothing
- Renamed onReplaceBodyPartMenuItemClicked to onReplaceMenuItemClicked because now this callback is used not only for Body Parts but for clothing also
- Added argument 'const LLUUID& item_id' for 'static void replaceWearable()' to be able to call onReplaceMenuItemClicked with LLUUID argument

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

--HG--
branch : product-engine
2010-07-15 15:57:57 +03:00
Tofu Linden 5190e7c1bb merge from PE's viewer-release 2010-07-10 13:52:05 +01: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
Igor Borovkov eaf114fdfd EXT-7786 FIXED COF Wearables List is updated only when visible (panel outfit eidt)
Every single delete/create operation in the COF causes LLCOFWearables to be updated - on each update its contained LLFlatListView is repopulated. That means massive creation of LLPanel's instances (LLUICtrlFactory::buildPanel(...)). Half of the panel creation time is spent in the EXPAT xml library on parsing the .xml files of the panel item.

I've forbidden updates of LLCOFWearables when Panel Outfit Edit is not in the visible chain. Panel Outfit Edit is now updated only when it is visible
Also LLCOFWearables refures to refresh its content if COF category version hasn't been changed since the last refresh.

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

--HG--
branch : product-engine
2010-07-09 17:47:33 +03: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
Igor Borovkov 5fef1c902a EXT-8061 FIXED refactoring, added a mapping for According Tab > Asset Type (COF Wearables)
Reviewed by Neal Orman  at https://codereview.productengine.com/secondlife/r/704/

--HG--
branch : product-engine
2010-07-08 18:55:45 +03:00
Vadim Savchuk e595ea43be EXT-8170 FIXED Fixed clothing context menu localization in Edit Outfit.
- Localized the "New Shoes" string.
  I'm sceptical about this fix. Let's see if the translation team accepts it.
  If not, I'll add a bunch of new translatable strings like "Create new shoes", "Create new pants", etc.
- Translated the "Replace" item of clothing context menu (took translation from the body part context menu).

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

--HG--
branch : product-engine
2010-07-07 21:27:04 +03:00
Igor Borovkov 979dc6257a EXT-8061 FIXED resetting selection inside accordion (panel outfit edit)
- added resetting lists selection on tabs state changes
- added committing on tab selection change
- added filtering wearables by at first by a selected tab and then by an expended tab

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

--HG--
branch : product-engine
2010-07-06 18:11:14 +03:00
Igor Borovkov c146471e93 EXT-8145 FIXED disabled committing on selection change when list's selection is restored (panel edit outfit)
turning off committing on selection change for the COF Wearables flat lists while restoring selection between refreshes/updates

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

--HG--
branch : product-engine
2010-07-02 15:07:33 +03:00
Alexei Arabadji 8b38c0e49d EXT-8158 FIXED Replaced toggling with show functionality of outfit edit panel.
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/677/

--HG--
branch : product-engine
2010-07-01 19:52:14 +03:00
Andrew Polunin 66ce337a32 EXT-7914 FIXED (Update context menu for worn clothing in the Edit Outfit panel)
- Removed the following menu items: Move Up a Layer, Move Down a Layer.
- Added 'Replace' menu item.
- Implemented method replaceWearable() - handler for the 'Replace' menu item.

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/642/

--HG--
branch : product-engine
2010-06-25 15:10:43 +03:00
Paul Guslisty 370ddfb03e EXT-7963 FIXED Edit Outfit > Add More > Do not switch to next item type after add/replace
- Added callback to wear item from Add More panel on doubleclick
- To keep the list in its existing state and do not change the contents of the Add More panel to the next listed unworn item after the user wears an item, check if the item is not dummy. Dummy icons have no ids.

Reviewed by Mike Antipov and Neal Orman at https://codereview.productengine.com/secondlife/r/647/

--HG--
branch : product-engine
2010-06-24 15:13:30 +03:00
Yuri Chebotarev 16eeea4cc5 EXT-7975 FIX Didn't show menu if there is no work clothing among selected items
reviwed by Neal Orman at https://codereview.productengine.com/secondlife/r/635/

--HG--
branch : product-engine
2010-06-24 14:58:04 +03:00
Vadim Savchuk 8cf968e00e EXT-7903 FIXED Disabled "Edit" context menu option for multi selection in the Outfit Editor.
Trivial fix, not reviewed.

--HG--
branch : product-engine
2010-06-17 21:58:37 +03:00
Andrew Polunin 83c1ca9a05 EXT-7693 ADDITIONAL FIX Added assertion in the type_map to make sure xml and code are in sync
--HG--
branch : product-engine
2010-06-16 16:10:16 +03:00
Andrew Polunin e460985ddf EXT-7639 FIXED added shop button which reacts according to the ticket description
- Added method LLAccordionCtrl::getExpandedTab() which search for the first expanded accordion tab. This method is a bit of hacking, but I discussed it with Vadim Savchuk.
- LLAccordionCtrlTab::isExpanded() is made 'const'. This is necessary to call it from getExpandedTab() which is also 'const'.
- Added all provided Marketplace URLs (taken from EXT-7257) to the settings.xml. So URLs can be configured without recompilation.
- Added method LLCOFWearables::getSelectedItems() which can be used to get ALL selected items (not only one).
- Class LLShopURLDispatcher is implemented in the llpaneloutfitedit.cpp.
- Added callback LLPanelOutfitEdit::onShopButtonClicked() which calls LLShopURLDispatcher to send user to the correct URL.
- Added shop button (shop_btn) widget in panel_outfit_edit.xml. It has invalid icon for now. After review I'm going to reassign the ticket to someone who will provide correct icons.

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

--HG--
branch : product-engine
2010-06-15 21:52:15 +03:00
Vadim Savchuk 9ad26f5e8f EXT-7611 FIXED Enabled the "Create new [TYPE]" context menu item for non-worn items in the outfit editor.
Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/535/

--HG--
branch : product-engine
2010-06-09 14:25:22 +03:00
Andrew Dyukov 65f8d1822d EXT-7511 FIXED Resolved problem with cropping of item selection bottom
Problem reproduced for items which had divider at the bottom. It was caused by non-optimal placement of divider
in item. To fix this, "top" attribute of divider was changed, and when done so it turned out that increase of items
height from implementation of this task was not necessary, so rolled back these changes in xml and code. Also added some padding between flatlists items to avoid cropping of top part of item selection because of divider.

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

--HG--
branch : product-engine
2010-06-04 20:21:07 +03:00
Igor Borovkov f954936d60 EXT-7575 FIXED appended attachment location after name in parenthesis.
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/514

--HG--
branch : product-engine
2010-06-04 15:53:07 +03:00
Andrew Dyukov 7902899df5 EXT-7511 FIXED Fixed problems in appearance UI
- Made slight changes in xml according to requirements.

- Added mForceNoLinksOnIcons bool member to LLPanelInventoryListItemBase. It is used in LLPanelWearableListItem to disable showing of link icons as
was requested in ticket.

- Created icon for divider 3 pixels high as asked by Erica in EXT-7233. To properly show and hide it made changes to LLCOFWearables::buildClothingListItem
which now not only showes separator but also reshapes panel depending on its visibility. Increased heights of body parts, dummy clothing and attachment items because
dividers are now 2 pxls higher and they always have dividers. Changed heights of buttons accordingly.

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

--HG--
branch : product-engine
2010-06-03 16:21:56 +03:00
Vadim Savchuk 142a6c3b8f EXT-6726 WIP Added missing menu items to the Appearance SP.
- Hooked up Wear / Take off / Rename / Delete items in the My Outfits gear menu.
- Added "Create new..." to body part / clothing context menu in Edit Outfit.
- Added "Create new..." submenus to the Edit Outfit gear menu.
- Disabling the "Take Off" menu item of the clothing context menu in the Edit Outfit panel when it's irrelevant.

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

--HG--
branch : product-engine
2010-06-02 20:46:16 +03:00
Igor Borovkov a543a1276e EXT-7527 FIXED repositioned "Add more..." button (panel edit outfit)
- relocated Add button (required substantial layout_stacks repositioning)
- got rid of switch/shop buttons
- reverted addition of adaptors for (accordion tabs/list view) inline button bars

* failed to get rid of an empty space above bottom bars when "add wearables panel" is invisible
(due to bug in the layout stack, when border is still drawn below layout panel which is only one visible)
https://jira.secondlife.com/secure/attachment/39854/empty+space+.jpg

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/481/

--HG--
branch : product-engine
2010-06-01 17:24:35 +03:00
Vadim Savchuk 39eb49c5f4 Manual merge from default branch.
Semi-automatically resolved conflicts in:
* indra/newview/llappearancemgr.cpp
* indra/newview/llappviewer.cpp
* indra/newview/llcofwearables.cpp
* indra/newview/llinventoryfunctions.cpp
* indra/newview/llpaneloutfitedit.cpp
* indra/newview/skins/default/xui/en/strings.xml
* indra/newview/skins/default/xui/ja/strings.xml

--HG--
branch : product-engine
2010-05-31 16:18:22 +03:00