Commit Graph

81 Commits (8912a9bef62386e5eecaa61ba9079d507ae16d90)

Author SHA1 Message Date
leslie@leslie-HPz600.lindenlab.com f1c01becf2 EXP-857 PROGRESS -- Add context menu entries as alternate path to populate outbox
* Folders containing items being worn now have the "Copy to Marketplace" context
  menu item disabled.
2011-08-30 16:18:34 -07:00
Leyla Farazha 2d4d7e7ca3 EXP-1093 User can place multiple copies of a no-copy item in merchant outbox to sell and can cause viewer to crash 2011-08-16 15:58:34 -07:00
Leyla Farazha 6f7132ca77 deleting folders after no-copy move to outbox 2011-08-15 09:53:26 -07:00
Leyla Farazha e69efc8369 EXP-843 Enable drag and drop from the outbox
EXP-1036 Disable most inventory functionality for the outbox view
2011-08-12 10:39:35 -07:00
Loren Shih c8293e29ca Automated merge up from viewer-development into mesh-development 2011-03-09 11:24:54 -05:00
Seth ProductEngine 7f53c0934a STORM-28 FIXED Added the ability to send agent's own calling card to others.
- Added creating own calling card for the user to be able to share it with other residents.
- Moved calling cards synchronization with friends list to the viewer start up. Previously synchronized upon opening the Friends tab in People side panel.
- Calling cards for non-friends are not removed upon calling cards synchronization with friends list.
- Enabled "Share" menu item for calling cards in inventory.
2011-02-22 18:46:00 +02:00
Loren Shih 584c7ecb4e Automated merge up from viewer-development 2011-01-13 10:28:15 -05:00
Vadim ProductEngine 05c14aa558 STORM-702 FIXED Made it possible to wear partial outfits
Enabled the "Replace Current Outfit" option for incomplete outfits (i.e. those that don't contain full set of body parts).
2011-01-04 13:52:29 +02:00
Loren Shih 225ffbba20 Automated merge up from viewer-development 2010-10-27 15:08:21 -04:00
Vadim ProductEngine 802a985882 STORM-311 FIXED "Share" button in My Inventory SP was not updated on Current Outfit changes.
When you wear an inventory item, the code that disables/enables the button was called as soon
as the item got linked to COF, before it actually appeared on your avatar. However
to determine whether to enable the button, the code checked avatar appearence.

I fixed it to take the COF link into account, i.e. to treat items linked to COF as
worn (=not shareable), no matter has appearance been updated or not.
2010-10-20 19:24:32 +03:00
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04: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
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04: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
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
Dave Parks 2f012dd34f merge 2010-08-25 14:48:18 -05: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
Vadim Savchuk 749a48ad73 EXT-8258 ADDITIONAL FIX Enable the 'Trash' button in 'My Inventory' when a 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
2010-07-28 21:23:14 +03:00
Tofu Linden 77c3a65db6 merge from viewer-release 2010-07-28 10:37:06 +01:00
Alexei Arabadji 431a6771cc Performed necessary refactoring after merge rev. 14093:babb41195f70
--HG--
branch : product-engine
2010-07-27 18:00:37 +03:00
Vadim Savchuk 0a5eaf89bc EXT-8258 ADDITIONAL FIX Enable the 'Trash' button in 'My Inventory' when a 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
2010-07-28 21:23:14 +03:00
Tofu Linden b459f95551 merge from viewer-release 2010-07-28 10:37:06 +01:00
Alexei Arabadji 872c7fd957 Performed necessary refactoring after merge rev. 14093:babb41195f70
--HG--
branch : product-engine
2010-07-27 18:00:37 +03:00
Dessie Linden 5d85dad85f Reverted changeset 2bb10eae42bf 2010-07-15 12:31:08 -07:00
Dave Parks 13202e744c merge 2010-07-14 11:11:31 -05:00
Sergei Litovchuk f790036002 EXT-8190 PARTIAL FIX Fixed loading indicator infinite spins upon pressing '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
2010-07-10 00:34:36 +03:00
Tofu Linden 297bab71ab CID-495
Checker: FORWARD_NULL
Function: show_item_original(const LLUUID &)
File: /indra/newview/llinventoryfunctions.cpp
2010-07-05 12:04:28 +01:00
Loren Shih 3fca4b0d61 automated merge 2010-06-28 12:32:21 -04:00
Monroe Linden 8d18056e82 Fix for EXT-8025 ('+' button on My Appearance > Edit Outfit panel does nothing)
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 .
2010-06-25 16:04:45 -07:00
Loren Shih 9139238500 EXT-7914 FIXED Current outfit can be removed via My Inventory -> Trash button
Now disabling remove if an outfit is linked in the COF.
2010-06-25 16:07:27 -04:00
Dave Parks 37a8c12bd3 merge 2010-06-14 23:04:11 -05:00
Vadim Savchuk a8276dfd59 Merge from default branch
--HG--
branch : product-engine
2010-06-18 14:08:46 +03:00
Richard Nelson b52044cf26 Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-06-17 15:54:27 -07:00
Vadim Savchuk 9f99644360 EXT-7722 Fixed "Add to COF" and "Remove from COF" outfit context menu items 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
2010-06-17 19:03:57 +03:00
Yuri Chebotarev 9eeaaf6738 EXT-7791 FIX Show inventory panel if its not visible.
reviewed by Mike Antipov, Loren Shih at https://codereview.productengine.com/secondlife/r/599/

--HG--
branch : product-engine
2010-06-17 11:02:12 +03:00
Richard Nelson 4aef5f54de EXT-7734 FIX In-world object properteis often don't show correct information
reviewed by Leyla
2010-06-16 17:32:51 -07:00
Yuri Chebotarev a66ec792c9 EXT-7790 FIX Reset inventory filter when showing original item in inventory
reviwed by Loren Shih at https://codereview.productengine.com/secondlife/r/575/

--HG--
branch : product-engine
2010-06-16 10:10:59 +03:00
Vadim Savchuk 48ccb5755e EXT-6726 ADDITIONAL FIX Minor code cleanup.
Removed duplicated code from LLFolderBridge::isItemRenameable().

Requested by Richard at https://codereview.productengine.com/secondlife/r/466/

--HG--
branch : product-engine
2010-06-09 18:19:23 +03:00
Dave Parks ba454baab3 Lost code. 2010-06-08 12:20:32 -05:00
Dave Parks f461ae214c Merge with render-pipeline 2010-06-07 23:05:22 -05:00
Vadim Savchuk 59496719bb Removed an obsolete comment.
Requested by Richard: https://codereview.productengine.com/secondlife/r/466/

--HG--
branch : product-engine
2010-06-03 20:42:08 +03:00
Vadim Savchuk 142a6c3b8f EXT-6726 WIP Added missing menu items to the Appearance SP.
- 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
2010-06-02 20:46:16 +03:00
Vadim Savchuk 671625695f EXT-6726 WIP Added more menus to the Appearance SP.
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
2010-06-02 20:46:16 +03:00
Vadim Savchuk 39eb49c5f4 Manual merge from default branch.
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
2010-05-31 16:18:22 +03:00
Paul Guslisty d42fd6cf7f EXT-7472 FIXED Open add to outfit panel by (+) button click on unwearable 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
2010-05-28 20:10:10 +03:00
Nyx (Neal Orman) cd46893057 EXT-7209 EXT-7366 EXT-7213 FIX EXT-7392 WIP
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! :) )
2010-05-27 14:40:49 -04:00
Vadim Savchuk cb05897152 EXT-6726 WIP Added handlers for most of Appearance SP context/gear menus.
Reviewed by Mike Antipov and Nyx at https://codereview.productengine.com/secondlife/r/428/

--HG--
branch : product-engine
2010-05-25 14:17:11 +03:00