Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
back-out the back-out for this branch. yay.
|
|
Backing out this merge that I pushed (prematurely) to the wrong place.
|
|
|
|
|
|
feeeeling.
|
|
|
|
|
|
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
|
|
selected item gets worn.
This is an additional fix to the one approved in https://codereview.productengine.com/secondlife/r/772/.
Looks like sometimes get_is_item_worn() fails to determine that an item is actually worn.
I suppose it happens when the item is already linked to COF but not yet known to LLAgentWearables.
So I try fixing it by adding a COF links check to get_is_item_worn(), so that an item is considered worn as soon as it's linked to COF.
Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/822/
--HG--
branch : product-engine
|
|
|
|
--HG--
branch : product-engine
|
|
selected item gets worn.
This is an additional fix to the one approved in https://codereview.productengine.com/secondlife/r/772/.
Looks like sometimes get_is_item_worn() fails to determine that an item is actually worn.
I suppose it happens when the item is already linked to COF but not yet known to LLAgentWearables.
So I try fixing it by adding a COF links check to get_is_item_worn(), so that an item is considered worn as soon as it's linked to COF.
Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/822/
--HG--
branch : product-engine
|
|
|
|
--HG--
branch : product-engine
|
|
|
|
|
|
'Save' for outfit with non-link items.
- Added inventory collector functor to select items by their actual type.
- Fixed outfit "dirtiness" calculation so only link items are checked.
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/728/.
--HG--
branch : product-engine
|
|
Checker: FORWARD_NULL
Function: show_item_original(const LLUUID &)
File: /indra/newview/llinventoryfunctions.cpp
|
|
|
|
Button now gets disabled in the early-exit case in LLPanelOutfitEdit::onInventorySelectionChange().
onInventorySelectionChange() also uses the new predicate get_can_item_be_worn(), which both checks whether the item is already being worn and whether it's of a type that could be worn.
Reviewed by Nyx at http://codereview.lindenlab.com/2451030 .
|
|
Now disabling remove if an outfit is linked in the COF.
|
|
|
|
--HG--
branch : product-engine
|
|
|
|
to be enabled when appropriate and work properly.
Work on "Take Off - Remove from Current Outfit" and "Wear - Add to Current Outfit" menu options:
- The menu items of the outfit context menu and the My Outfits gear menu are now disabled
when inappropriate instead of being hidden.
- The menu items get enabled/disabled depending on whether you can wear (take off) anything from the selected outfit.
(was: depending on whether you're wearing the outfit)
- Changed the way the options work: they now only operate on clothes and attachments.
"Add to COF" now only adds those body parts that are missing in COF;
"Remove from COF" doesn't touch body parts at all.
Without this change both "Add" and "Remove" options would be available simultaneously, because
any valid outfit contains body parts. I think that would be confusing.
And you don't expect you body parts to be replaced when doing "Add to COF'. (that's addition, not replacement)
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/585/
--HG--
branch : product-engine
|
|
reviewed by Mike Antipov, Loren Shih at https://codereview.productengine.com/secondlife/r/599/
--HG--
branch : product-engine
|
|
reviewed by Leyla
|
|
reviwed by Loren Shih at https://codereview.productengine.com/secondlife/r/575/
--HG--
branch : product-engine
|
|
Removed duplicated code from LLFolderBridge::isItemRenameable().
Requested by Richard at https://codereview.productengine.com/secondlife/r/466/
--HG--
branch : product-engine
|
|
|
|
|
|
Requested by Richard: https://codereview.productengine.com/secondlife/r/466/
--HG--
branch : product-engine
|
|
- 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
|
|
Done:
- Implemented creating new wearables via My Outfits gear menu.
- Implemented renaming/removing/editing an outfit via My Outfits context menu.
- Implemented "Attach to..." / "Attach to HUD..." context submenus.
- Now disabling (instead of hiding) irrelevant wearable context menu items.
- Added "Take Off / Detach" context menu item that's shown for clothes and attachments.
Useful if you selected a bunch of items and want to take them all off.
- Fixed taking off an outfit
(not all wearables were taken off because of a wrong inventory collector).
- Fixed crash when editing a skirt
(reference to a missing string).
- In LLWearableItemsList::ContextMenu::updateItemsVisibility renamed variables
and introduced MASK_UNKNOWN per Nyx's request.
Known issues:
- "Attach to..." context menus may be displayed partially off-screen
(there is the same bug in the inventory panel).
- The way we invoke wearable editing panel after the wearable gets created
is currently a hack.
TODO:
- Wear / take off / rename / delete an outfit via My Outfits gear menu
(currently not implemented because of missing selection support in My Outfits).
- Add "Create new..." to body part / clothing context menu in Edit Outfit.
- Add "Create new..." submenus to the Edit Outfit gear menu.
Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/466/
--HG--
branch : product-engine
|
|
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
|
|
items and by selecting 'Replace' menu item click body part context menu
Main changes:
- Added callback for a '(+) button' to the LLCOFCallbacks and bind it with LLPanelOutfitEdit::onAddWearableClicked
- Created the callback(LLPanelOutfitEdit::onReplaceBodyPartMenuItemClicked) for 'Replace' menu item of context menu
Related changes:
- Changed LLFilteredWearableListManager so that it can use different functors (subclasses of LLInventoryCollectFunctor) as a criterion for LLInventoryItemsList filtering. Before it used only LLFindNonLinksByMask filter. Moved LLFindNonLinksByMask from to the llfilteredwearablelist.cpp to the llinventoryfunctions.h
- Created getter 'LLPanelDummyClothingListItem::getWearableType()' for LLPanelDummyClothingListItem
- Made 'add wearables panel' a member of LLPanelOutfitEdit so that not to use findChild each time panel is needed
Reviewed by Igor Borovkov at http://jira.secondlife.com/browse/EXT-7472
--HG--
branch : product-engine
|
|
Final fixes for:
EXT-7209 camera to enter appearance edit mode
EXT-7366 change camera to face front of avatar in previews
EXT-7213 kill old appearance editor
Partial fix for:
EXT-7392 alpha mask checkboxes are not hooked up
All changes code reviewed by vir. Following commits (plus this one) reviewed with this checkin:
425d4e960450
15d04b6464a7
e92ae606de12
adc94512ea9b
24577dbbf7a4
6f28b241eae2
(sorry dessie! :) )
|
|
Reviewed by Mike Antipov and Nyx at https://codereview.productengine.com/secondlife/r/428/
--HG--
branch : product-engine
|
|
Superficial header file cleanup
Lots of moving functions around and recategorizing in LLInventoryModel.h
Removed some obsolete functions, changed scoping of others
Moved some static functions from LLInventoryModel into llinventoryfunctions.h
|
|
Const correctness, logic cleanup, took out subclasses redefining same variable as base class (!!!).
|
|
EXT-7295 : FIXED : INFRASTRUCTURE : Cleaned up Inventory Icon code
Inventory link icons were designed from scratch.
Added LLInventoryIcon class and did some major refactoring for how it determines inventory icons from item bridges.
|
|
|
|
Added missing 'Delete' button to the Notecard Preview dialog;
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/330/
--HG--
branch : product-engine
|
|
|
|
Superficial header file cleanup for LLInventoryFunctions.
Change made to simulator files as well.
|
|
Took out enums and flags from LLInventory into LLInventoryDefines
Did a bunch of header file reformatting for LLInventory.h
Change made to simulator files as well.
|
|
|