summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
AgeCommit message (Collapse)Author
2010-06-14mergeDave Parks
2010-06-14mergeDave Parks
2010-06-11EXT-7779 FIXED Changed wearing panel from inventory panel to a flat list ↵Sergei Litovchuk
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-18Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-06-10mergeDave Parks
2010-06-10automated mergeLoren Shih
2010-06-10EXT-7430 : Create art overlay for inventory icons that are linksLoren Shih
Changed folder icon logic to use LLViewerFolderType (as it should always been doing).
2010-06-10Add "LL_MESH_ENABLED" preprocessor flag for toggling mesh code. Couple of ↵Dave Parks
merge fixes.
2010-06-09EXT-7430 : Create art overlay for inventory icons that are linksLoren Shih
Took out explicit _Link icons and replaced with overlay. Removed links overlays from non-main-inventory-floater panels.
2010-06-09EXT-6726 ADDITIONAL FIX Minor code cleanup.Vadim Savchuk
Removed duplicated code from LLFolderBridge::isItemRenameable(). Requested by Richard at https://codereview.productengine.com/secondlife/r/466/ --HG-- branch : product-engine
2010-06-08Merge fix.Dave Parks
2010-06-08Merge cleanup.Dave Parks
2010-06-07Merge with render-pipelineDave Parks
2010-06-04Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicNyx (Neal Orman)
2010-06-03VWR-19699 WIP Correct operations for wear and replace on wearablesNyx (Neal Orman)
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-03mergeRichard Linden
2010-06-03EXT-7429 FIXED Removed itallicise \"worn\" objects in inventory panelsPaul Guslisty
- 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-02EXT-6726 WIP Added more menus to the Appearance SP.Vadim Savchuk
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-02EXT-2704 FIXED added custom inventory folder iconsIgor Borovkov
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/488/ --HG-- branch : product-engine
2010-06-01Merge with dessie/viewer-public in prep to land code thereJames Cook
2010-05-27EXT-7209 EXT-7366 EXT-7213 FIX EXT-7392 WIPNyx (Neal Orman)
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-26 EXT-7213 WIP kill old appearance editor and traces of codeNyx (Neal Orman)
Removed last remaining references to gFloaterCustomize. Next step: kill the files themselves. Will be reviewed when complete, before pushing
2010-05-26Merge with dessie/viewer-public to get Callum's webkit changesJames Cook
2010-05-26EXT-7213 WIP kill old appearance editor and all traces of codeNyx (Neal Orman)
part 2 - correcting a few points that would have broken the build. Final version will be reviewed before pushing.
2010-05-26Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicNyx (Neal Orman)
2010-05-26Merge from default branch, resolving conflict in ↵Mike Antipov
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-25EXT-7213 WIP kill old appearance editor and all traces of codeNyx (Neal Orman)
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-25mergeRichard Linden
2010-05-25VWR-13743 FIXED Change Request: Change double click action for inventory ↵Tofu Linden
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-25VWR-13743 FIXED Change Request: Change double click action for inventory ↵Tofu Linden
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.
2010-05-25EXT-6726 WIP Added handlers for most of Appearance SP context/gear menus.Vadim Savchuk
Reviewed by Mike Antipov and Nyx at https://codereview.productengine.com/secondlife/r/428/ --HG-- branch : product-engine
2010-05-24mergeRichard Nelson
2010-05-21EXT-6710 FIXED Implemented functionality to give multiselected inventory ↵Mike Antipov
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-21EXT-6710 WIP Prepare to implementation - "Give inventory" related ↵Mike Antipov
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-19AVP-44 WIP Back-end support for multiwearablesNyx Linden
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-19Merge pull from dessie/viewer-publicLeyla Farazha
2010-05-18Rename mSLID to mUsername to match the name of the field in the UIJames Cook
Product made a late-breaking request to change the name of this field. The wire protocol for People API has not yet changed.
2010-05-14EXT-7353 FIXED short cuts (links) to textures should show up in the texture ↵Loren Shih
picker Links in general will now show up for all filtered inventory views of their associated types.
2010-05-13merge pull from dessie/viewer-public, picking up SLE codeJames Cook
2010-05-12EXT-7319 : FIXED : INFRASTRUCTURE : LLInventoryBridge cleanupLoren Shih
Const correctness, logic cleanup, took out subclasses redefining same variable as base class (!!!).
2010-05-11merge from dessie/viewer-public right before SLE code landedJames Cook
2010-05-11EXT-7305 : FIXED : Changed LLWearableDictionary to LLWearableTypeLoren Shih
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-11EXT-7306 : FIXED : Add shortcut-style icons for inventory linksLoren Shih
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-07EXT-7276: Hide "paste as link" under Debug Setting ("InventoryLinking")Loren Shih
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-07EXT-7269 : FIXED : Issue warning dialog when item is deleted that has links ↵Loren Shih
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-05Fixed major bug EXT-6797 (attempting to create new folder while viewing ↵Mike Antipov
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-04-30merge from viewer-trunkTofu Linden
2010-04-29fixed EXT-6736 Notecard floater missing Keep/Discard Buttons (vwr 2.0)Alexei Arabadji
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-28merge from viewer-trunkTofu Linden
2010-04-28Compile error fix for missing description field in link_inventory_item.Loren Shih