Commit Graph

126 Commits (c20bd2dfee1068d5a23eef9a10d21c2035c0b324)

Author SHA1 Message Date
Richard Nelson c20bd2dfee cleaned up LLUICtrlFactory...
removed redundant functionality
moved buildPanel to LLPanel
2010-08-16 15:00:51 -07: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
Tofu Linden f0b1424cb8 merge from viewer-release 2010-08-07 12:46:27 +01:00
Paul Guslisty c187fdcf1f EXT-7963 FIXED (Edit Outfit > Add More > Do not switch to next item type after add/replace)
- Added selected item type (in flat list view) as criterion when determining filter type in 'Add More' panel

- Fixed LLAccordionCtrl::getSelectedTab() method. When 'selection_enabled = false' for LLAccordionCtrlTab, LLAccordionCtrl::getSelectedTab() returned NULL, even if some accordion tab was selected. Now it's OK. Method returns currently selected LLAccordionCtrlTab.

Recovered from bad merge in 13811

Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/790/

--HG--
branch : product-engine
2010-08-06 19:41:23 +03:00
Tofu Linden 07f668fe2b fix a merge conflict I forgot to commit earlier. 2010-08-05 13:31:19 +01: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
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
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
Paul Guslisty bdacad23bb EXT-7963 FIXED (Edit Outfit > Add More > Do not switch to next item type after add/replace)
- Added selected item type (in flat list view) as criterion when determining filter type in 'Add More' panel

- Fixed LLAccordionCtrl::getSelectedTab() method. When 'selection_enabled = false' for LLAccordionCtrlTab, LLAccordionCtrl::getSelectedTab() returned NULL, even if some accordion tab was selected. Now it's OK. Method returns currently selected LLAccordionCtrlTab.

Reviewed by Mike Antipov,  Neal Orman and Richard Nelson at https://codereview.productengine.com/secondlife/r/790/

--HG--
branch : product-engine
2010-07-26 14:42:21 +03: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
Richard Nelson 76a9c1214f merge 2010-07-30 10:07:14 -07:00
Richard Nelson 566e3969f9 deprecated LLPanel::child*() methods 2010-07-30 10:02:30 -07:00
Mike Antipov 59033f244f EXT-7406 RE FIXED Replaced inventory collector for objects to exclude links from the Edit Outfit->Add More panel.
Restored fix that was previosly committed in 76bd52803506 and then somewhy reverted in 5b5cc4a8642d.

--HG--
branch : product-engine
2010-07-29 17:12:37 +03:00
Paul Guslisty 5fb799b12f EXT-7565 FIXED RECOVER FROM BAD MERGE (Would be nice to preserve selection while switching between folder/list view modes)
Added missed (during bad merge 14077:5b5cc4a8642d) code to the llpanloutfitedit(.h/.cpp):
  recover LLPanelOutfitEdit::updateWearablesPanelVerbButtons() and LLPanelOutfitEdit::saveListSelection() methods

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

--HG--
branch : product-engine
2010-07-29 13:35:54 +03: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
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
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
Brad Payne (Vir Linden) b0c700bfa0 merge 2010-07-20 11:44:26 -04: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
Andrew Polunin 0fa0ffb574 EXT-7639 FIXED (Make shop button open different URLs depending on what is selected in outfit editor) - 'Add More' panel multiple selection behavior
Implemented the following behavior: \"if multiple selection is made in the Add More panel then default marketplace home URL can be used\".

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

--HG--
branch : product-engine
2010-07-16 18:19:31 +03: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 f65a95157a merge from PE's viewer-trunk (viewer-public) 2010-07-15 08:54:55 +01: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
Igor Borovkov 3ddd44e5e6 EXT-8329 FIXED added updating Plus button on COF changes
added updating Plus button (Wear Item button) on COF changes (only when Edit Outfit panel is trully visible)

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

--HG--
branch : product-engine
2010-07-13 18:47:04 +03:00
Andrew Polunin 885442eb54 EXT-7639 FIXED (Make shop button open different URLs depending on what is selected in outfit editor)
- Fixed old market place URL to the new one in the settings.xml.
- Implemented the following feature: \"When Add More panel in focus selection inside it should supersede selection in accordions\". To achieve this:
-- LLPanelOutfitEdit::getCOFWearablesSelectionType() function was implemented.
-- LLPanelOutfitEdit::getAddMorePanelSelectionType() function was implemented.
-- LLPanelOutfitEdit::getWearableTypeByItemUUID(const LLUUID& item_uuid) function was implemented.
-- LLPanelOutfitEdit::onShopButtonClicked() was rewritten to use those functions.
- Fixed the problem with shop button and gender: now shop button for male leads to male links.

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

--HG--
branch : product-engine
2010-07-13 17:31:15 +03:00
Sergei Litovchuk b34bf6d871 EXT-8180 FIXED resetting wearable items list position to top on "Add More" panel opening.
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/680/.

--HG--
branch : product-engine
2010-07-13 17:04:33 +03:00
Vadim Savchuk d07a354d0a Merge from default branch
--HG--
branch : product-engine
2010-07-12 14:38:45 +03:00
Igor Borovkov 96631f6d4e EXT-7406 FIXED excluded inventory links from Add More list view (panel outfit edit)
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/723

--HG--
branch : product-engine
2010-07-09 19:08:46 +03: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 67a06e4df2 Merge from default branch
--HG--
branch : product-engine
2010-07-09 14:56:56 +03: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 222cd49ad5 Merge from default branch
--HG--
branch : product-engine
2010-07-08 14:32:45 +03:00
Vadim Savchuk 840e33e41e EXT-8168 FIXED Used localized labels when populating 'New Clothes' and 'New Body Parts' submenus of the My Outfits gear menu.
Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/708/

--HG--
branch : product-engine
2010-07-07 20:55:35 +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
Sergei Litovchuk 38d54c0750 EXT-8180 FIXED Added resetting wearable items list position to top on "Add More" panel reopen.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/680/.

--HG--
branch : product-engine
2010-07-06 17:25:02 +03:00
Vadim Savchuk 6e252a3568 merge
--HG--
branch : product-engine
2010-07-06 15:39:27 +03:00
Andrew Polunin 5e4a2850a9 EXT-7984 FIXED (onVisibilityChange callback was used instead of onOpen)
Removed code from LLPanelOutfitEdit::onOpen and move it to LLPanelOutfitEdit::onVisibilityChange (as suggested by Nyx Linden at http://jira.secondlife.com/browse/EXT-7984).

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

--HG--
branch : product-engine
2010-07-06 15:22:20 +03:00
Tofu Linden 49a3fc9cc3 CID-494
Checker: FORWARD_NULL
Function: LLPanelOutfitEdit::filterWearablesBySelectedItem()
File: /indra/newview/llpaneloutfitedit.cpp
2010-07-05 12:07:00 +01:00