Commit Graph

149 Commits (8485bff29b98f47954b78b31b2e0511f94de3be4)

Author SHA1 Message Date
Kadah 472fcabcb3 Merge avatar-physics to Firestorm 2.5.2 2011-04-14 16:33:21 -07:00
Kitty Barnett 604345b918 Merged with .RLVa tip
--HG--
branch : RLVa
2011-02-19 01:12:23 +01:00
Oz Linden ad99134668 Automated merge with file:///Users/oz/Work/viewer-development 2010-12-14 22:59:36 -05:00
Oz Linden efa42a6aab merge up to viewer-development 2010-12-04 09:14:58 -05:00
Richard Linden d276950c8d build fixes 2010-11-15 17:03:52 -08:00
Kitty Barnett 9498c31d3c Merged with default tip (Revision aeb7e6c38341)
--HG--
branch : RLVa
2010-10-31 23:41:40 +01:00
Kitty Barnett 1c2ef4090a Merged with default tip (Revision f20bf424bd86)
--HG--
branch : RLVa
2010-10-30 17:28:00 +02:00
Merov Linden 3116e0d352 STORM-426 : merge with viewer-development 2010-10-25 13:43:22 -07:00
Vadim ProductEngine ba0d4ccaf4 STORM-341 FIXED Crash on exiting viewer while Outfit Editor is opened in detached Appearance SP.
Reason: An inventory observer (LLFilteredWearableListManager) tried to use
a deleted collect functor (LLFilterItem::collector in LLPanelOutfitEdit::mListViewItemTypes).

Fix: De-register (and delete) the observer when the collector gets deleted.
2010-10-25 21:38:22 +03:00
Seth ProductEngine 54da19fdcf STORM-426 FIXED Menu button no longer looked pressed while its menu is displayed by another control.
- LLMenuGL in menu button replaced by LLToggleableMenu that handles visibility change upon clicks inside specific button rect.
- Added visibility change signal to LLToggleableMenu to update menu button pressed state.
- Added using menu handle in LLMenuButton.
2010-10-22 02:08:26 +03:00
Seth ProductEngine c12c60df4a STORM-263 FIXED popup menu of Cog button in lower-left of sidebar panel closing on second click
- Changed type of gear menu buttons from LLButton to LLMenuButton in all sidebar panels where gear menu button is used.

- Added setMenuPosition(), setMenu() and updateMenuOrigin() to the LLMenuButton.

- Moved actions common for displaying a context menu to LLMenuButton::toggleMenu().

- In all sidebar panels where LLButton was replaced with LLMenuButton the following steps were taken:
    1. setting gearMenu and its position relative to the menuButton with LLMenuButton::setMenu()
    2. setting mouse down callback for the menuButton if needed.
    3. calculating the menu origin point with LLMenuButton::updateMenuOrigin() in mouse down callback
2010-10-15 00:10:55 +03:00
Kitty Barnett 4ed8028ca6 - fixed : wearable list shouldn't be visible in the "Outfit Edit" sidebar panel when @showinv=n restricted
--HG--
branch : RLVa
2010-09-16 02:47:35 +02:00
Loren Shih eed7b72011 automated merge 2010-09-08 17:58:17 -04:00
Tofu Linden 7f428e6c86 merge VWR-22724 FIXED Clicking an attachment switched the Add More inventory to Flat view 2010-09-01 16:01:19 +01:00
Paul Guslisty 0e031ba5fa VWR-22724 FIXED Clicking an attachment switched the Add More inventory to Flat view
Added checking when item in COF list selected: IF (FolderListView is shown) THEN (don't switch to the FlatListView AND set proper filter for FlatListView).

Reviewed by Vadim Savchuk
2010-08-31 20:33:49 +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
Richard Linden 1911993cc7 merge 2010-09-16 19:45:57 -07:00
Monroe Linden b62b10dd26 Post-convert merge by convert_monolith.py from ./viewer-experience 2010-08-27 16:58:33 -07: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
Richard Nelson c20bd2dfee cleaned up LLUICtrlFactory...
removed redundant functionality
moved buildPanel to LLPanel
2010-08-16 15:00:51 -07: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
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