Age | Commit message (Collapse) | Author |
|
# Conflicts:
# indra/llui/llfolderviewmodel.h
# indra/newview/llpanelwearing.cpp
# indra/newview/llwearableitemslist.cpp
|
|
|
|
|
|
Menus
|
|
|
|
getChangedIDs is only accurate in scope of observer's callback, don't
use it onIdle.
getObject call made no sense, item was warrantied to be
LLViewerInventoryItem and would only be AT_CATEGORY if it is a link,
making the following cast to a category dangerous
|
|
|
|
|
|
|
|
LF, and trim trailing whitespaces as needed
|
|
|
|
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
|
|
getChangedIDs is only accurate in scope of observer's callback, don't
use it onIdle.
getObject call made no sense, item was warrantied to be
LLViewerInventoryItem and would only be AT_CATEGORY if it is a link,
making the following cast to a category dangerous
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Initial version, further refactoring pending
|
|
1) Added "Select Photo" to outfit gear menu
2) Incorporated Texture Picker
|
|
1) Made code clean-up
2) Removed constants in code via #define and introduced parametres which can ne set in XML instead
3) Made refactoring of some methods
4) Removed non-functional item "Load assets" from outfit gear-menu
|
|
Fixed Mac specific build issues
|
|
|
|
|
|
|
|
added, which are called by menu items in gear menu.
|
|
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.
|
|
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
|
|
|
|
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
|
|
|
|
|
|
back-out the back-out for this branch. yay.
|
|
Backing out this merge that I pushed (prematurely) to the wrong place.
|
|
|
|
streamlined LLUICtrlFactory's interface
|
|
- 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
|
|
|
|
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
|
|
--HG--
branch : product-engine
|
|
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
|
|
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
|
|
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
|
|
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
|
|
item or base outfit is selected.
--HG--
branch : product-engine
|