Commit Graph

80 Commits (680194deaf7a35caaa629abc16e886d71baff636)

Author SHA1 Message Date
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
maksymsproductengine e6c85c46c4 MAINT-3555 crash in LLPanel::~LLPanel() on shutdown:
- memory leaks fixing;
2014-02-05 20:45:09 +02:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
maxim_productengine f93b94daa9 MAINT-56 FIXED collapse_all_folders() and expand_all_folders() functions are added, which are called by menu items in gear menu. 2012-08-22 11:42:44 +03:00
Nat Goodspeed ee87fd975f DRTVWR-136: Remove redundant remove_(item|category)() functions.
Incoming changes from two different project repos left viewer-development with
LLInventoryModel::removeItem() and removeCategory() plus free functions
remove_item() and remove_category() in llinventoryfunctions.cpp.
remove_category() was actually the better implementation; migrated its body
into LLInventoryModel::removeCategory(). Clearly the previous state of affairs
-- with LLInventoryModel::removeItem() plus a remove_category() free function
in a very different source file -- fooled two different developers into
overlooking the other of the pair. Unfortunately we each added different
"missing" functions, leaving us with a complete set of four.
Fix existing references to remove_item() and remove_category() free functions.
2012-04-14 22:23:24 -04:00
Paul ProductEngine 9d3fc5d930 EXP-1209 FIXED Sidetray removed.
- Removed all sidetray dependencies and the sidetray itself.

- Also removed LLFloaterSidetrayTab and LLSidetrayListener as unused.
2011-09-29 21:43:07 +03:00
Paul ProductEngine 3c8b0ab537 EXP-1226 FIXED (Create and register a floater for Appearance side tab)
- Added xml for a new floater Appearance and registred it in the floaterreg

- Removed side tray dependencies

- Added static helper method: LLFloaterSidePanelContainer::getPanel
2011-09-27 22:06:56 +03:00
Leslie Linden 98bcd9e2ef EXP-859 FIX -- Save setting for last time inbox expanded
EXP-841 PROGRESS -- Create outbox sync button with basic enable/disable logic and animation
EXP-866 PROGRESS -- Create inbox observer to dynamically update inbox item count and badge value
EXP-872 PROGRESS -- Hide inbox and outbox unless applicable

Inbox expansion time is now saved as setting variable "LastInventoryInboxExpand".

New outbox sync button art.

Observers for items and categories are now implemented in the LLSidepanelInventory but the exact
method of use is still to be determined.

Functions are in place to show and hide the inbox and outbox panels but the logic around the
decision is TBD.

The resize bar for the inbox/outbox is now disabled when both inbox and outbox are collapsed.

Reviewed by Leyla.
2011-06-06 17:00:59 -07:00
Paul Guslisty 6be708677e STORM-459 FIXED Delete outfit confirmation message doesn't appear if use context or gear menu on 'My Outfits' tab
Added confirmation dialog before deleting outfit from context menu and gear menu button of My Appearance -> My Outfits

- Deleted method that shows confirmation dialog in LLPanelOutfitsInventory. Moved it to the LLOutfitsList. Now confirmation dialog called before calling LLOutfitsList::removeSelected.

- Replaced native methods of deleting outfit in gear menu and context menu with LLOutfitsList::removeSelected.
2010-10-28 12:14:43 +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
Richard Linden 1911993cc7 merge 2010-09-16 19:45:57 -07:00
Tofu Linden 395a5cbaff merge 2010-09-16 19:55:55 +01:00
Vadim Savchuk 3641e9cfc8 STORM-186 FIXED The "Take Off - Remove from current outfit" option of the My Outfits gear menu now ignores item selection, taking aff all wearables. 2010-09-16 19:42:18 +03:00
Vadim Savchuk 4495dd26f8 STORM-183 FIXED The "Replace Current Outfit" option of the My Outfits gear menu (which is only applicable to outfits) wasn't disabled for selected wearables. 2010-09-16 18:25:27 +03:00
Paul Guslisty 36f3535f70 STORM-93 FIXED Added Take Off function to the gear menu and implemented this functionality using helper methods:
canTakeOffSelected() - checking whether selected item(s) can be taken off
hasItemSelected() - checking whether any item selected
getSelectedItemsUUIDs() - returns selected items ids
2010-09-10 15:59:35 +03:00
Tofu Linden 332f502ede CID-503
Checker: REVERSE_INULL
Function: LLOutfitsList::refreshList(const LLUUID &)
File: /indra/newview/lloutfitslist.cpp
2010-09-09 13:56:44 +01:00
Monroe Linden b62b10dd26 Post-convert merge by convert_monolith.py from ./viewer-experience 2010-08-27 16:58:33 -07:00
Richard Linden 093e83386d merge 2010-08-26 12:49:00 -07:00
Richard Linden a0b15c827e outfits accordions now have proper contents 2010-08-25 16:46:52 -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
Richard Nelson 65c9914d23 made Params parsers not act as singletons 2010-08-23 11:03:19 -07:00
Richard Nelson 02d8197019 changed buildPanel/buildFloater to member functions buildFromFile
streamlined LLUICtrlFactory's interface
2010-08-20 10:14:28 -07: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 79e767b91d merge from viewer-release 2010-08-11 13:44:35 +01:00
Vadim Savchuk 863e380fb6 EXT-8576 FIXED Only attachments are worn if multi-select items on 'My Outfits' tab and press 'Wear' button.
Reason: avatar appearance was not updated if the last selected item was an attachment.
Fix: make sure appearance is updated afterwards, regardless of items types.

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

--HG--
branch : product-engine
2010-08-10 22:38:29 +03:00
Sergei Litovchuk 7bce6580dc EXT-7593 FIXED Added passing focus to the selected outfit tab when My Outfits tab is open.
- Removed "tab_stop" from outfit tabs to prevent passing focus to a tab chosen by default from LLUICtrl::focusFirstItem(). Besides the order of passing focus between outfit tabs by pressing "Tab" was undetermined.
- Had to remove const from the return of LLAccordionCtrl::getSelectedTab() to use the returned pointer for setting focus.

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

--HG--
branch : product-engine
2010-08-09 15:23:00 +03: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
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
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
Vadim Savchuk de81d9d8a7 EXT-8481 FIXED Wear button in My Outfits being enabled when worn item is selected.
- Fixed condition for enabling the Wear button in My Outfits.
- The button was always enabled when when COF change completes, I fixed that as well.

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

--HG--
branch : product-engine
2010-07-23 18:06:49 +03:00
Sergei Litovchuk cf675389d0 EXT-8036 FIXED Fixed opening accordion tabs if they match filter after list refresh.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/697/.

--HG--
branch : product-engine
2010-07-06 17:24:14 +03:00
Alexei Arabadji a03e123148 EXT-8082 FIXED Fixed viewer crash in outfit list accordion.
Details:
1 Avoided memory leak of LLAccordionCtrlTab in LLOutfitsList::refreshList method.
2 Provided resetting selection in LLAccordionCtrl::removeCollapsibleCtrl method.

reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/701/

--HG--
branch : product-engine
2010-07-06 17:00:39 +03:00
Sergei Litovchuk 4081f6f584 EXT-8014 FIXED Enabled "Take off" in My Outfits gear menu if any of selected items can be taken off or selected outfit contains items that can be taken off.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/649/.

--HG--
branch : product-engine
2010-06-29 21:55:37 +03:00
Andrew Dyukov 1a3b463af3 EXT-7737 ADDITIONAL FIX Added changing of color to emphasis for selected outfit accordion header.
- Added method to accordion which allows to set color of its header's title and used it when highliting selected outfit.

- Set alias for emphasis color in colors.xml to let selected outfit color be easily changed via xml in case such decision is made(because leaving it green doesn't seem a very good idea).

- Also added alias for accordion header text color to avoid breaking of this fix if in header_text_color from accordion_tab.xml.

--HG--
branch : product-engine
2010-06-30 20:02:51 +03:00
Andrew Polunin 9bc4e69c91 EXT-7972 FIXED (My Outfits: Add \"Add to current outfit\" menu item into gear menu)
- Added menu item 'Wear - Add to Current Outfit' (menu_outfit_gear.xml).
- Added menu item handler onAdd().

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

--HG--
branch : product-engine
2010-06-25 17:00:45 +03:00
Andrew Dyukov a209e339ee EXT-7793 FIXED Implemented wearing separate wearables instead of whole outfit when individual items are selected in list.
- Added wearSelectedItems() method to LLOutfitsList which wears all items selected in outfit lists (if possible- adds, else replaces).
It is called when clicking wear if there is selection of individual items(LLOutfitsList::hasItemSelected() returns true). Otherwise
whole outfit is worn.

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

--HG--
branch : product-engine
2010-06-24 18:00:09 +03:00
Andrew Dyukov cb801fafb2 Comments: EXT-7158 ADDITIONAL FIX Slight changes to fix according to review
Added additional check to avoid deselcting of items when filter is applied and made a couple of renames according to Mike's comments in review at https://codereview.productengine.com/secondlife/r/648/

--HG--
branch : product-engine
2010-06-24 16:51:15 +03:00
Sergei Litovchuk f5f43b5d3a EXT-8014 FIXED Enabled "Take off" in My Outfits gear menu only if a worn item or base outfit is selected.
--HG--
branch : product-engine
2010-06-24 15:39:09 +03:00
Andrew Dyukov 9aad53a437 EXT-7158 FIXED Implemented showing of full outfit content if its name or any item(s) inside it match current filter.
- Added availability to force showing unmatched items to LLFlatListViewEx

- Applied it to wearable items lists in LLOutfitsList

- Changed condition for outfit accordion tab showing (because now all items are visible, so checking their number doesn't help).
Used here check for a flag added in this fix, which tells whether last applied filter found any matches in the list.

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

--HG--
branch : product-engine
2010-06-24 01:52:26 +03:00
Sergei Litovchuk 2583a4d6ea EXT-4295 FIXED Added gear and context menus for Wearing tab.
- Moved My Outfits gear menu from llpaneloutfitsinventory.cpp to lloutfitslist.cpp

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

--HG--
branch : product-engine
2010-06-22 16:34:27 +03:00
Sergei Litovchuk 887b2858d4 EXT-7779 FIXED Changed wearing panel from inventory panel to a flat list similar to My Outfits view.
- Added common interface for My Outfits and Wearing tabs.
- Changed LLPanelOutfitsInventory to use common interface for My Outfits and Wearing tabs.
- Removed dependency on outfits side panel from inventory bridge context menus.
- Removed unused LLShowCreatedOutfit class from llagentwearables.cpp.
- Restored opening newly created outfit in My Outfits tab.
- Fixed worn items indication for Wearing tab items.

Revieved by Neal Orman at https://codereview.productengine.com/secondlife/r/604/.

--HG--
branch : product-engine
2010-06-11 20:02:42 +03:00
Mike Antipov 08381a276d EXT-7755 ADDITIONAL FIX Fixed issues with wrong title after an outfit from the Inventory is worn, "Wear..." menu items state is made consistent with "Wear" button.
* Empty string is replaced with "Changing outfits" while changing COF;
* Fixed title to show "No Outfit" after an outfit from the Inventory is worn;
* Fixed bug with visible indicator after an empty folder is DnD from the Inventory "Clothing"
* Updated context and Gear "Wear..." menu items to take into account "isCOFChangeInProgress" state in on_enable callbacks

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

--HG--
branch : product-engine
2010-06-23 15:30:48 +03:00
Andrew Dyukov f4c20d43bc EXT-7875 FIXED Implemented resetting of selection inside outfit on accordion collapse/expand.
- Added method which resets selection and tied it up to DropDownStateChangedCallback.

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

--HG--
branch : product-engine
2010-06-22 15:00:22 +03:00
Andrew Dyukov 9aa7109456 EXT-7847 FIXED Disabled "trash" button if an item is selected inside selected outfit.
- Added bool mItemSelected variable and getter for it to determine if the selection inside outfit exists, and used it when determining whether to enable "Trash" button in My Outfits.

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

--HG--
branch : product-engine
2010-06-18 12:56:02 +03:00