Commit Graph

69 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
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
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
Richard Nelson e0c404a866 EXT-7742 WIP "Add to Outfit" type filter should contain items for each wearable type and for each category
added ability to filter inventory folder view by wearable type
2010-06-14 17:26:32 -07:00
Loren Shih e414a91d7f EXT-7430 : Create art overlay for inventory icons that are links
Took out explicit _Link icons and replaced with overlay.
Removed links overlays from non-main-inventory-floater panels.
2010-06-09 17:09:42 -04:00
Nyx (Neal Orman) c26eeb6f7a Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-06-04 11:10:15 -04:00
Nyx (Neal Orman) 2caa710a46 VWR-19699 WIP Correct operations for wear and replace on wearables
Resident-submitted patch, cleaned up so it matches style and compiles/builds
well. Appears to work for stated goals but will need some more UI work to
ensure consistency.

WIP checkin, will be code reviewed before pushing.
2010-06-03 20:06:25 -04:00
Paul Guslisty 5dc2fcf8e2 EXT-7429 FIXED Removed itallicise \"worn\" objects in inventory panels
- Added checking in LLItemBridge::getLabelStyle() if item is worn
- Also deleted unnecessary method LLObjectBridge::getLabelStyle() as it duplicate LLItemBridge::getLabelStyle()

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

--HG--
branch : product-engine
2010-06-03 20:46:56 +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
Loren Shih dbaaebfe5b EXT-7319 : FIXED : INFRASTRUCTURE : LLInventoryBridge cleanup
Const correctness, logic cleanup, took out subclasses redefining same variable as base class (!!!).
2010-05-12 13:46:21 -04:00
Loren Shih f1c775b7be EXT-7319 : FIXED : INFRASTRUCTURE : LLInventoryBridge cleanup
Superficial header file cleanup
2010-05-12 11:40:38 -04:00
Loren Shih adc0aba2dd EXT-7305 : FIXED : Changed LLWearableDictionary to LLWearableType
Refactored LLWearableDictionary to look more like LLAssetType/LLFolderType/etc. in terms of code design.  This required a lot of superficial changes across many files.  Overall functionality has not changed.
2010-05-11 15:08:29 -04:00
Loren Shih 64da5083d0 EXT-7306 : FIXED : Add shortcut-style icons for inventory links
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.
2010-05-11 13:01:27 -04:00
Loren Shih 183122bc1d EXT-7269 : FIXED : Issue warning dialog when item is deleted that has links pointing to it
Warning now comes up if you try to delete an item that has any item links pointing to it (in memory).  This assumes that the viewer actually knows about those links, which is true at least in 2.0 since links only appear in Outfits folders and this code causes those to be fetched into memory on startup.
2010-05-07 13:44:03 -04:00
Mike Antipov 15413e4442 Fixed major bug EXT-6797 (attempting to create new folder while viewing recent inventory renames newest item instead.)
Implemented Recent Inventory Panel specific classes to create appropriate context menu for Folders in Recent Items Panel:
 * Registered new LLInventoryRecentItemsPanel class
 * Added appropriate Folder Bridge and Bridge Builder

Updated main inventory panel to not show "+" button on Recent Items tab
 * Placed controls into Layout Stack.
 * Change visibility of panel with "+" button while switching between tabs.
 * also made bottom panel wider to be consistent with other side panels (see screenshots).

Reviewed by Loren Shih at https://codereview.productengine.com/secondlife/r/334/

--HG--
branch : product-engine
2010-05-05 12:29:53 +03:00
Loren Shih c495e7f42a EXT-7109 : Ensure "Open" works for all types, change to "Open Original" for links
Added new "Open Original" menu item for links, to clarify that you're opening the item the link is pointing to.
2010-04-27 14:03:42 -04:00
Eugene Mutavchi 27b457f2ce Implemented major task EXT-6710(Feature request: Allow drag and drop from Inventory panel to Resident Picker)
- added handling the drag add drop inventory items to resident picker
 - added "Share" verb button to the inventory panel which opens resident picker
 - added "Share" menu item to the individual inventory context menu which acts as verb button
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/215/

--HG--
branch : product-engine
2010-04-12 17:02:16 +03:00
Loren Shih 825e4df30d EXT-6689 : INFRASTRUCTURE : LLInventoryBridge code cleanup
Moved a bunch of local llinventorybridge functions into .cpp.
Did a bunch of superficial cleanup of llinventorybridge and related files.
2010-04-02 11:12:59 -04:00
Loren Shih 1ec47c39a6 EXT-6679 : INFRASTRUCTURE : Have LLInvFVBridge contain a LLFolderView *mRoot instead of passing it along everywhere such as in performAction
mRoot is now stored for all LLInventoryBridge types.
Did some superficial formatting cleanup for LLInventoryBridge.
2010-04-01 17:50:48 -04:00
Loren Shih 5372782d50 EXT-4084 : Change LLInventoryBridge "LLFolderView* folder" to "LLFolderView *rootFolder"
Superficial cleanup - changed all instances to "LLFolderView* root".
2010-04-01 14:29:23 -04:00
Loren Shih 14d77a36d4 EXT-4993 : Deleting an item from the COF in Inventory Floater keeps it worn
EXT-4997 : Centralize right-click menu options for delete/remove link
EXT-4998 : Automatically reject double separators from right click menu

Disabled/hid delete button from COF right-click menu, also means that trash icon is disabled.
Added generalized function to remove consecutive separators from right-click menu.
Made a minor cosmetic change to have all code duplication for adding "delete" menu item instead call a common function.
2010-02-04 18:38:47 -05:00
Loren Shih 643b014fb8 EXT-4990 : "Find Original" should be enabled for links in the trash
EXT-4988 : Centralize right-click menu options when items are in trash

This change is a lot less scary than it looks.  There is a bit of minor cosmetic cleanup (e.g. typedefing a commonly-used vector), and I've eliminated code duplication since, previously, every item/listener type had its own purge/restore item dialog; these are now handled in one central function.
I also moved "Find Original" above Purge/RestoreItem so that it appears first in the trash menu; this does not affect other menu options.
The functionality change from this checkin is to enable "Find Original" for link items in the trash.
2010-02-04 16:43:46 -05:00
Loren Shih c58e152236 EXT-4801 : hitting trash button for trashed items does not delete item
EXT-4957 : add const correctness for LLFolderViewEventListener::isItemRemovable

This checkin affects several files but is a lot less scary than it looks.  It's mostly to add const correctness, and to rename isInTrash to isItemInTrash so that its naming is consistent with isItemRemovable/isItemMovable.
The only functionality change is to disable the trash button when an item is already in the trash.
2010-02-04 14:29:43 -05:00
Dmitry Zaporozhan c679ae3546 Fixed normal bug EXT-4768 - 'Play' btn does nothing to gesture in Inventory side panel.
--HG--
branch : product-engine
2010-02-01 17:11:31 +02:00
Tofu Linden 7814eaec00 CID-386
Checker: UNINIT_CTOR
Function: LLFolderBridge::LLFolderBridge(LLInventoryPanel *, const LLUUID &)
File: /indra/newview/llinventorybridge.h
2010-01-27 16:16:28 -08:00
Mike Antipov 4230c65548 Fixed major bug EXT-4609 Deleting duplicate calling cards also removes a Resident from ur Friends list :(
- removed separate logic for Residents in the Friends list when Calling card is removed

--HG--
branch : product-engine
2010-01-22 13:17:58 +02:00
richard e28eac929b EXT-4014 - Inventory folders should use "open" folder art...
reviewed by Leyla
2010-01-06 16:17:27 -08:00
Brad Payne (Vir Linden) 5c8b2deb82 For EXT-3622: Take off item, wear a different item --> first item is put on again. Fixed the 'remove all clothing' case. 2009-12-23 15:15:49 -05:00
Brad Payne (Vir Linden) 55c1f18c8d For EXT-3622: Take off item, wear a different item --> first item is put on again 2009-12-22 16:41:21 -05:00
Loren Shih 03c75c22f9 EXT-3329 : Able to delete system folder is confusing - disable from non-god mode
"Delete" no longer works for system folders.
Created a new "Delete System Folder" context menu entry that only works in RelWithDebug if only one item is selected.

--HG--
branch : avatar-pipeline
2009-12-17 18:47:58 -05:00
Loren Shih d3d454988a EXT-2677 : "Remove From Outfit" active even when I'm not wearing any items in the folder
Now checking contents of the folder for any actively worn items for determining this flag.

--HG--
branch : avatar-pipeline
2009-12-17 15:47:07 -05:00
Eric M. Tulla (BigPapi) f042f35381 Merge of viewer2 into avp branch
--HG--
branch : avatar-pipeline
2009-12-11 13:37:00 -05:00
Eric M. Tulla (BigPapi) 9db47b1d4b Fix for EXT-3368 - "Save Texture" functionality was no longer respecting perms 2009-12-10 16:07:54 -05:00
Brad Payne (Vir Linden) 6af53dd7e2 For EXT-2858: Determine gear menu / right-click menu choices for AppearanceSP
--HG--
branch : avatar-pipeline
2009-12-10 15:31:08 -05:00
Loren Shih 71cd24b479 EXT-3124 : Add lookup for finding all linked items to an item
Added ability to filter by UUID.  Work in progress.

--HG--
branch : avatar-pipeline
2009-12-03 21:32:03 -05:00
Eric M. Tulla (BigPapi) b05ebd8977 merge of viewer2 into avp branch
--HG--
branch : avatar-pipeline
2009-12-03 12:09:16 -05:00
Loren Shih c09b2bd9c9 EXT-3057 : Refine the context options that exist for broken links
EXT-2950 : Trying to waer a link or to "Find Original" of a link silently fails when original is deleted

Missing links are now handled correctly in the right-click context menu.

--HG--
branch : avatar-pipeline
2009-12-02 14:16:07 -05:00
Loren Shih 7e181025c0 EXT-2456 : Usability: Inventory > Clothing > context menu not intuitive
Context menu now fills in after folder contents are fetched.

--HG--
branch : avatar-pipeline
2009-11-20 15:38:50 -05:00
Loren Shih ad86caf479 EXT-2668 : Screwy logic for figuring out if a folder is removable
EXT-2661 : "Remove From Outfit" on COF doesn't take off my outfit
EXT-2662 : Can't delete a worn item link

Cleaned up the whole "isItemRemovable" logic, and having folders figure this out recursively via children.
Changed the isItemRemovable logic so that links aren't treated as worn for the purposes of deletion.

--HG--
branch : avatar-pipeline
2009-11-19 17:56:30 -05:00
Loren Shih 5dea0791f7 EXT-2581 : Old items still display as "(worn)" even after I change outfits
Added gInventory.notifyObservers to idle callbacks so it gets triggered without explicit notifyObservers synchronization.
Added more state tracking for attachments, wearables, and links of those types, so that they're marked as changed properly.
2009-11-18 14:51:14 -05:00
Eric M. Tulla (BigPapi) 15354ab16e EXT-2117 - Fix for not being able to add / remove multiple items of different types from your inventory 2009-12-01 20:01:19 -05:00
Loren Shih 42319d1ab8 Header file cleanup
Moved LLInventoryPanelObserver to be private to LLInventoryPanel

--HG--
branch : avatar-pipeline
2009-11-13 18:22:00 -05:00
Loren Shih acdce23299 Header file cleanup
Removed unnecessary "#include llinventorymodel.h" now that llinventoryobserver was split from llinventorymodel.

--HG--
branch : avatar-pipeline
2009-11-13 17:47:00 -05:00
Loren Shih 9c048d12fd merge
--HG--
branch : avatar-pipeline
2009-11-06 18:31:52 -05:00
Loren Shih 2aa981ac23 EXT-2278 : "Save Texture As" for bottom panel
EXT-2310 : "Save Texture As" for inventory right-click menu

"Save Texture As" now works properly and brings up the texture preview while saving.
Also added "Save Texture As" to the right-click inventory context menu.

--HG--
branch : avatar-pipeline
2009-11-06 17:35:05 -05:00
Bryan O'Sullivan b806edf4ac Redo Bao's broken merge 2009-11-04 14:59:23 -08:00
Loren Shih bde7d67066 EXT-1866 : Inventory Side Panel
svn merge -r137106:137808 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-panel

Porting over changes from svn Inventory Panel work.
2009-11-02 15:39:55 -05:00
Steven Bennetts 6f41747bc4 Merging revisions 2112-2128 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry
* Bugs: EXT-1605 EXT-1506 EXT-1663 EXT-1616 EXT-1599 EXT-1587
* Dev: EXT-748 EXT-1447
* IM Cleanup
2009-10-21 04:58:23 +00:00
Steven Bennetts 8103710c05 Merging revisions 2046-2068 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry
* Bugs: EXT-1414 EXT-1213 EXT-1539 EXT-1253  EXT-1446 EXT-1438 EXT-1233 EXT-1466 EXT-1446 EXT-1512 EXT-1231
* Dev: EXT-719 (landmarks) EXT-747 EXT-1446 EXT-1378 EXT-397 EXT-1476
* IM changes
2009-10-19 01:45:44 +00:00
Bradley Payne 73d152093d For DEV-34223: Avatar Pipeline Project - M6 (Current Outfit Folder, Appearance Side Panel) - brought merge branch changes from avatar-pipeline/viewer-2.0.0-3_cwf-7_merge into viewer-2.0.0-3.
svn merge -r132878:132947 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/viewer-2.0.0-3_cwf-7_merge
2009-09-10 18:42:19 +00:00
Steven Bennetts 0aa2bc4831 svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2
Bug Fixes:
* EXT-637 EXT-595
Dev work:
* EXT-694
QA:
* Be sure feature works on other locales
Known issues:
* If old Calling Card of person who presents in the friend list is removed - "Do you want to remove ..." dialog is shown, if old Calling Card of non-friend is removed it is removed in the old way without any alerts.
* It is possible to create 2 deep level subfolders under the Calling Cards/Friends/ subfolders. This should be disabled due to Accordion does not support tree hierarchy.
* If friendship is removed when agent is offline, Friend Card is not removed from Inventory.
2009-08-28 22:58:17 +00:00