Commit Graph

299 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 a8276dfd59 Merge from default branch
--HG--
branch : product-engine
2010-06-18 14:08:46 +03:00
Monroe Linden b022a9f158 Fix for EXT-6277 ("Edit" right-click inventory item does nothing if item is not worn).
Reviewed by Leyla.
2010-06-17 15:59:42 -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
gabriel lee 42a4ab9ae1 EXT-7834 fixed corruption of menu item vectors
reviewed by Richard
2010-06-16 18:03:03 +01:00
Loren Shih f12aa928c5 EXT-7758 FIXED Take out "Change FolderType" for viewer2.1.
Change folder type is now keyed off of SUPPORT_ENSEMBLES versus being available in non-release viewers.
2010-06-15 15:56:54 -04:00
Loren Shih a37f7ec200 automated merge 2010-06-10 11:41:59 -04:00
Loren Shih 388318c532 EXT-7430 : Create art overlay for inventory icons that are links
Changed folder icon logic to use LLViewerFolderType (as it should always been doing).
2010-06-10 11:41:28 -04: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
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
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
Igor Borovkov ec6be24ed5 EXT-2704 FIXED added custom inventory folder icons
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/488/

--HG--
branch : product-engine
2010-06-02 13:59:07 +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
Nyx (Neal Orman) ec7dbc7040 EXT-7213 WIP kill old appearance editor and traces of code
Removed last remaining references to gFloaterCustomize.
Next step: kill the files themselves.
Will be reviewed when complete, before pushing
2010-05-26 18:22:04 -04:00
Nyx (Neal Orman) 1084bfef00 EXT-7213 WIP kill old appearance editor and all traces of code
part 2 - correcting a few points that would have broken the build.
Final version will be reviewed before pushing.
2010-05-26 13:27:19 -04:00
Nyx (Neal Orman) c7b6ab8208 Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-05-26 12:04:26 -04:00
Mike Antipov 14418c1970 Merge from default branch, resolving conflict in indra/newview/llinventorybridge.cpp
LLObjectBridge::openItem() was concurrency modified.
Applied behavior that was changed in c3220f7f7699 according to
	VWR-13743 FIXED Change Request: Change double click action for inventory wearables
	DEV-33391 FIXED Change Request: Change double click action for inventory wearables

--HG--
branch : product-engine
2010-05-26 10:24:05 +03:00
Nyx (Neal Orman) b524aacb59 EXT-7213 WIP kill old appearance editor and all traces of code
First pass - eliminated all references to gFloaterCustomize except
those that call saveIfDirty. Haven't compiled, haven't reviewed.
Will clean up in further patches and get reviewed before pushing.
2010-05-25 20:17:23 -04:00
Tofu Linden a781dd767c VWR-13743 FIXED Change Request: Change double click action for inventory wearables
DEV-33391 FIXED Change Request: Change double click action for inventory wearables

Pulled this from the AvP backlog and implemented it, as it's a pain point from Ben's usability findings.  And people loooove this in 3rd party viewers.
(transplanted from cd0857d027305aec3dbdfe1940a04f7827e3a656)
2010-05-25 13:27:17 +01: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
Mike Antipov 7439332656 EXT-6710 FIXED Implemented functionality to give multiselected inventory items to several selected avatars in avatar picker:
1. Select items to share
2. Click Share; Resident chooser opens
3. Select residents to share with, click SELECT
4. Selected items are transferred to selected users
5. Pop-up toast confirms transfer

Some implementation notes:
 * Avatar Picker is not closed when give inventory requests are sent (to be enable change selection and offer other items to other avatars)
 * Select button is enableв if all selected items can be offered.
 * Disabling of the "Share" menu item in the Inventory context menu is syncronized with check (before sending offer) whether item can be offered at all

Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/364/

--HG--
branch : product-engine
2010-05-21 13:16:41 +03:00
Mike Antipov 5c370550bf EXT-6710 WIP Prepare to implementation - "Give inventory" related functionality was moved from the LLToolDragAndDrop to a separate class - LLGiveInventory.
To allow give several inventory items to several selected residents I need some functionality encapsulated in LLToolDragAndDrop class out of it.
No functionality should be changed.

LLToolDragAndDrop was updated to use new LLGiveInventory'methods instead of removed ones.

There were moved methods related to:
 - give inventory item
 - give inventory category
 - log into chat
Such functionality was moved:
 - is give acceptable
 - do inventory give operation
 - send give inventory request to server
 - process give inventory for protected items

QA Notes: Functionality related to give inventory via drag and drop should be re-tested closely.

Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/364/

--HG--
branch : product-engine
2010-05-21 13:16:29 +03:00
Nyx Linden 8487341b0f AVP-44 WIP Back-end support for multiwearables
Changed a lot of areas of code that were not dealing with multiwearables properly.
Little functionality changed, as the support mechanisms that were out of date were
subtle, but getting closer to no further areas of code that don't properly support
multi-wearables.

Code reviewed by Vir.
2010-05-19 19:48:23 -04:00
Loren Shih 50fad31f09 EXT-7353 FIXED short cuts (links) to textures should show up in the texture picker
Links in general will now show up for all filtered inventory views of their associated types.
2010-05-14 17:31:56 -04: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 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 f28887554e EXT-7276: Hide "paste as link" under Debug Setting ("InventoryLinking")
In viewer2.0, paste as link was only allowed in god mode.  Here, it is allowable if the user sets a debug setting.  This prevents normal users from accidentally screwing up their inventory if they don't understand what a link is.
2010-05-07 16:33:18 -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
Alexei Arabadji 85e3432579 fixed EXT-6736 Notecard floater missing Keep/Discard Buttons (vwr 2.0)
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
2010-04-29 16:09:00 +03:00
Loren Shih ec36c092a2 Compile error fix for missing description field in link_inventory_item. 2010-04-28 14:14:06 -04:00
Loren Shih 29e1804139 automated merge 2010-04-28 13:37:21 -04: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
Loren Shih 404fe5b525 EXT-7076 : Allow "paste as link" for any item
EXT-7077 : Enable paste as link for folders

Took out code that was stopping paste for god-mode only.  Now everyone can do it.
Corrected a bool logic error for protected folder restrictions.
2010-04-26 16:43:02 -04:00
Loren Shih 417436f1e9 Fix for properly allowing deletion from COF when an item appears there that's not worn/attached. 2010-04-21 17:03:32 -04:00
Igor Borovkov ccd0418ddf completed EXT-6719 Utilize the "description" field of outfit wearable links to store order information
- COF items get checked for correct ordering when COF is loaded (LLAppearanceMgr::updateAppearanceFromCOF..., LLAppearanceMgr::updateClothingOrderingInfo() ), and also when COF is saved to a new outfit, base outfit.
- wearables are arranged in LLAgentWearables in a proper order

* updateClothingOrderingInfo() [struggling with naming] does integrity checking and updates "invalid" items (items with wrong, gapped descriptions)
* moved LLAgentWearables::makeNewOutfitLinks(...) and LLShowCreatedOutfit  to a more natural place (llappearancemgr.cpp), because they use LLAppearanceMgr's methods a lot
* changed link_inventory_item(...), added the "new_description" parameter

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

--HG--
branch : product-engine
2010-04-21 12:43:03 +03:00
Mike Antipov 59d296e200 Fixed major bug EXT-6682 (Emptying Lost & Found Folder can crash Viewer2.0 if recent item was added)
Reason: a pointer to renamed item was not nullified in Folder View when rename control lost focus.

Fix: updated focus lost callback to nullify the pointer to renamed item. Had to made this callback non-static to have access to Folder View's member pointer.

Also made "New..." menu items disabled for Lost & Found folder.

Reviewed by Tofu Linden at https://codereview.productengine.com/secondlife/r/251/

--HG--
branch : product-engine
2010-04-19 14:12:42 +03:00
Loren Shih 85f54aca0f automated merge 2010-04-13 16:39:12 -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
Mike Antipov 00462c2431 Fixed normal bug EXT-4347 (Moving object contents to inventory opens files, changes menu)
Implementation details:
 * Added new LLViewerInventoryMoveFromWorldObserver to watch moved items via their Asses UUIDs. It is instantiated only once due to drop events are sent separately for each item while multi-dragging.
 * Existent LLOpenTaskOffer observer uses it to exclude watched by LLViewerInventoryMoveFromWorldObserver items from own processing.
 * Removed dependancy on LLPanelPlaces in open_inventory_offer(). Openning of offered LM via group notice moved into an appropriate section (processed by LLOpenTaskGroupOffer)

Known Issues:
 * If Script item is among the dragged items from object to inventory it will be the only selected item in the inventory panel.
    Reason: it does not have its own Asset UUID and processed via LLOpenTaskOffer when should not.

Reviewed by Leyla and Richard at https://codereview.productengine.com/secondlife/r/116/

--HG--
branch : product-engine
2010-04-08 12:07:58 +03:00
Loren Shih f096f02278 EXT-6728 : Have LLInventoryFetchItems/DescendentsObserver inherit from a base abstract LLInventoryFetchObserver class
Added a new abstract class LLInventoryFetchObserver from which LLInventoryFetchItems and LLInventoryFetchDescendents inherit.
Also changed isEverythingComplete to isFinished and made some other minor superficial changes.
2010-04-06 18:58:26 -04:00
Loren Shih cdbdb11686 EXT-4151 : Immediately check if a fetchObserver filter is done, else add to observer list automatically
FetchObservers now take in a list of IDs to check against.
Made some naming changes.
2010-04-06 14:47:20 -04:00
Loren Shih 785d4c34b6 EXT-4151 : Immediately check if a fetchObserver filter is done, else add to observer list automatically
Preliminary work to clean up naming conventions.
2010-04-06 10:19:15 -04:00
Loren Shih 2eba9819df EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefines
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.
2010-04-05 15:02:36 -04:00
Loren Shih 568d6ed229 EXT-5940 : INFRASTRUCTURE: Typedef all vector<LLUUID>'s
Fixed some more typedefs that I missed in first checkin.
2010-04-02 15:19:44 -04: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