summaryrefslogtreecommitdiff
path: root/indra/newview/llpaneloutfitsinventory.cpp
AgeCommit message (Collapse)Author
2010-09-22mergeRichard Linden
2010-09-16STORM-122 FIXED Clean up obsolete floaters and related dead codeAimee Linden
Removed obsolete XUI files: floater_activeim.xml floater_customize.xml floater_device_settings.xml floater_first_time_tip.xml floater_im.xml floater_my_friends.xml floater_outfit_save_as.xml floater_preview_classified.xml floater_preview_event.xml floater_preview_gesture_info.xml floater_preview_gesture_shortcut.xml floater_preview_gesture_steps.xml floater_statistics.xml floater_wearable_save_as.xml panel_audio_device.xml panel_friends.xml panel_groups.xml panel_nearby_chat.xml panel_online_status.xml panel_region_general_layout.xml Killed obsolete LLFloaterVoiceDeviceSettings class, and moved LLPanelVoiceDeviceSettings into its own appropriately named files.
2010-08-27Post-convert merge by convert_monolith.py from ./viewer-experienceMonroe Linden
2010-08-16cleaned up LLUICtrlFactory...Richard Nelson
removed redundant functionality moved buildPanel to LLPanel
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-07-23EXT-8481 FIXED Wear button in My Outfits being enabled when worn item is ↵Vadim Savchuk
selected. - Fixed condition for enabling the Wear button in My Outfits. - The button was always enabled when when COF change completes, I fixed that as well. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/800/ --HG-- branch : product-engine
2010-07-05EXT-8146 FIXED Added confirmation dialog before outfit(s) deleting.Andrew Dyukov
- Added new notification which appears when trash button in "My Outfits" is clicked. Used it in code to only delete outfits if OK is selected. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/695/ --HG-- branch : product-engine
2010-06-30EXT-7793 FIXED Implemented "Wear" button tooltip changing depending on ↵Andrew Dyukov
selection. - Added check to LLPanelOutfitsInventory::updateListCommands() which takes place on selection change and depending on hasItemSelected() sets tooltip for "Wear" button. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/665/ --HG-- branch : product-engine
2010-06-29EXT-7976 FIXED The panel with Gear and Trash button was moved into ↵Vladimir Pchelko
panel_outfits_list.xml and (without trash button) panel_outfits_wearing.xml. Note: MY OUTFITS and WEARING controls size/positions were corrected to be similar to Places and Inventory. Reviewed by Mike Antipov and Neal Orman at https://codereview.productengine.com/secondlife/r/650/ --HG-- branch : product-engine
2010-06-24EXT-7793 FIXED Implemented wearing separate wearables instead of whole ↵Andrew Dyukov
outfit when individual items are selected in list. - Added wearSelectedItems() method to LLOutfitsList which wears all items selected in outfit lists (if possible- adds, else replaces). It is called when clicking wear if there is selection of individual items(LLOutfitsList::hasItemSelected() returns true). Otherwise whole outfit is worn. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/638 --HG-- branch : product-engine
2010-06-22EXT-4295 FIXED Added gear and context menus for Wearing tab.Sergei Litovchuk
- Moved My Outfits gear menu from llpaneloutfitsinventory.cpp to lloutfitslist.cpp Revieved by Neal Orman and Mike Antipov at https://codereview.productengine.com/secondlife/r/604/. --HG-- branch : product-engine
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-23EXT-7755 ADDITIONAL FIX Fixed issues with wrong title after an outfit from ↵Mike Antipov
the Inventory is worn, "Wear..." menu items state is made consistent with "Wear" button. * Empty string is replaced with "Changing outfits" while changing COF; * Fixed title to show "No Outfit" after an outfit from the Inventory is worn; * Fixed bug with visible indicator after an empty folder is DnD from the Inventory "Clothing" * Updated context and Gear "Wear..." menu items to take into account "isCOFChangeInProgress" state in on_enable callbacks Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/625/ --HG-- branch : product-engine
2010-06-22Merge after backout changeset: f0e9147baf74Mike Antipov
--HG-- branch : product-engine
2010-06-22EXT-7789 FIXED reverted changes with removing "Rename Outfit" from gear menuMike Antipov
Backed out changeset: f0e9147baf74 --HG-- branch : product-engine
2010-06-18EXT-7847 FIXED Disabled "trash" button if an item is selected inside ↵Andrew Dyukov
selected outfit. - Added bool mItemSelected variable and getter for it to determine if the selection inside outfit exists, and used it when determining whether to enable "Trash" button in My Outfits. Reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/600/ --HG-- branch : product-engine
2010-06-17EXT-7722 Fixed "Add to COF" and "Remove from COF" outfit context menu items ↵Vadim Savchuk
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-17EXT-7755 FIXED Updated condition to not show "No Outfit" as a status when ↵Mike Antipov
outfit is changing. Implementation details: * Added flag to LLAgentWearables to determining that outfit is changing. Synchronizing it with mLoadingStartedSignal and mLoadedSignal signals. * Check this flag when there is no outfit set to show empty title when outfit is being changed. * Also updated condition to disable "Wear" button when outfit is being changed. Additional improvements: * Removed reference to parent LLSidepanelAppearance from the LLPanelOutfitsInventory. * Now LLSidepanelAppearance is subscribed to mLoadingStartedSignal and mLoadedSignal to update its loading indicator. Known Issue: * When new outfit is being worn its name is shown in title for a short moment (loading indicator is shown at this time). Then it is changed with an empty title and is shown when outfit is already worn. If necessary it should be investigated and fixed in scope of another issue. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/593/ --HG-- branch : product-engine
2010-06-15EXT-7789 FIXED Removed "Rename Outfit" option from My Outfits gear menuVadim Savchuk
Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/584/ --HG-- branch : product-engine
2010-06-15EXT-7794 FIXED Implemented a common-used notification about wearing outfit ↵Mike Antipov
to display loading indicator. Details: * Added signal "Wearable Loading Started" in AgentWearables (in parallel with "Wearables Loaded") * Now it is raised from the LLAppearanceMgr::wearInventoryCategory. Reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/583/ --HG-- branch : product-engine
2010-06-11mergeMike Antipov
--HG-- branch : product-engine
2010-06-11EXT-7792 FIXED Made Wear button disabled if there are no selected outfit (or ↵Mike Antipov
list is empty). Also fixed some issues in accordion caused by removing My Outfits content via Inventory: - updated accordion's help text to not shown nothing if there are no any tabs and filter substring is empty. - added check of necessity to show help text when accordion "arrange" Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/568/ --HG-- branch : product-engine
2010-06-11EXT-6726 WIP Improved the way we disable irrelevant items of the My Outfits ↵Vadim Savchuk
gear menu. * Made the "Wear" and "Take Off" items mutually exclusive (i.e. only one of them is now shown). * Hide all context-dependant items ("Wear", "Take off", "Rename", "Delete") when no outfit selected. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/566/ --HG-- branch : product-engine
2010-06-10EXT-7620 FIXED Disable context-dependant outfit gear menu items if no (or ↵Vadim Savchuk
invalid) outfit selected. The "Create new clothes / body parts" menu items are always enabled because they have no on_enable callback set. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/548/ --HG-- branch : product-engine
2010-06-10EXT-7615 FIXED Fixed the trash button in My Outfits.Vadim Savchuk
- Now it's enabled when the "Delete Outfit" context menu item is enabled. - It actually deletes the selected outfits. Known out-of-scope issues: - The trash button is sometimes enabled when the WEARING tab is active. - The check whether an outfit can be removed is probably wrong. There is a separate ticket (EXT-7716) for that. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/550/ --HG-- branch : product-engine
2010-06-08EXT-7644 FIXED Implemented functionality for locking outfit modification ↵Alexei Arabadji
controls and used it for 'save outfit' action. 1 Added functionality for locking outfit in LLAppearanceMgr. Outfit should be locked when outfit related operation is started(now it is used for updateBaseOutfit) and unlocked when operation completed or timeout is exceeded. 2 Added outfit saved and outfit lock changed signals to LLOutfitObserver. 3 Updated LLPanelOutfitsInventory and LLPanelOutfitEdit with functionality of controlling 'save outfit' controls state('save outfit' controls should be enabled only if outfit isn't locked and outfit is dirty). 4 Renamed action label of method LLPanelOutfitsInventory::isActionEnabled "make_outfit" to "save_outfit". --HG-- branch : product-engine
2010-06-04EXT-7485 FIXED Provided update of 'save as' button status and save outfit ↵Alexei Arabadji
panel status. 1 published LLCOFObserver as LLOutfitObserver(moved from llpaneloutfitedit.cpp to lloutfitobserver.h) 2 decoupled outfit edit panel and observer by replacing pointer to panel with signals and made observer as singleton 3 moved call of LLAppearanceMgr::getInstance()->updateIsDirty() from outfit edit panel to observer(discussed with IB) 4 modified updating of combo button state on outfit panel using LLOutfitObserver 5 modified refresh of outfit name and status on outfit change event using LLOutfitObserver 6 removed unnecessary LLWatchForOutfitRenameObserver that caused excessive updates of outfit panel status name --HG-- branch : product-engine
2010-06-03mergeMike Antipov
--HG-- branch : product-engine
2010-06-03EXT-7503 WIP Made first inventory fetch in My Outfits panel only on first ↵Mike Antipov
panel opening. * LLOutfitsList is not Inventory Observer anymore * Content is fetched in onOpen now * Added call of the LLOutfitsList::onOpen when "My Outfits" tab is switched on in My Appearance panel Reviewed by Brad Payne at https://codereview.productengine.com/secondlife/r/456/ --HG-- branch : product-engine
2010-06-02EXT-6726 WIP Added missing menu items to the Appearance SP.Vadim Savchuk
- 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-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-05-31EXT-7485 FIXED Updated 'save as new' button on inventory outfit pane to fit ↵Alexei Arabadji
spec. * moved logic related to combo button from LLPanelOutfitEdit to LLSaveOutfitComboBtn class; * used LLSaveOutfitComboBtn class in LLPanelOutfitsInventory; reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/459/ --HG-- branch : product-engine
2010-05-20EXT-6726 WIP Added stubs for most of Appearance SP context/gear menus.Vadim Savchuk
Shared code with avatar lists context menus. Reviewed by Mike Antipov and Nyx at https://codereview.productengine.com/secondlife/r/415/ --HG-- branch : product-engine
2010-05-19EXT-7242 FIXED Added a new "Edit my Shape" link to avatar self-click context ↵Vadim Savchuk
menu and made it open the shape editing panel. Again, as in EXT-7241, I tried to improve the way the appearance panels (outfits / edit outfit / edit wearables) are switched, this time aiming to eliminate redundant time-consuming operations (fetches/updated/etc). I'm not particularly satisfied with the resulting code but it seems to work. A better solution might be to wrap the panels with LLSideTrayPanelContainer. Additional minor changes: - Fixed unsafe pointer cast in LLSidepanelAppearance::editWearable(). - Removed redundant onEditOutfitButtonClicked() and onEditWearBackClicked() methods from LLSidepanelAppearance. Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/395/ --HG-- branch : product-engine
2010-05-15EXT-7241 FIXED Changed all "Edit Appearance" links to "Change Outfit" and ↵Vadim Savchuk
pointed them to the My Outfits tab. Renamed the following menu items to "Change Outfit" and made them open My Outfits tab: - Avatar in-world context menu -> My Appearance. - Avatar inspector menu -> My Appearance. - Me -> My Appearance. To enable the Appearance SP switch to My outfits I cleaned up the logic of switching between my outfits <-> edit outfit <-> edit wearable panels. Also done the following cleanups and minor improvements: - Removed unused LLSidepanelAppearance::mEditBtn and mLookInfoType members. - Removed empty LLSidepanelAppearance::updateVerbs() method. - Made the "params" argument of LLSideTray::showPanel() and togglePanel() optional. Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/389/ --HG-- branch : product-engine
2010-05-13EXT-4088 : FIXED : INFRASTRUCTURE : Change LLFolderView::getSelectionList to ↵Loren Shih
return a selection Function signature change to return a selection instead of taking one as an argument.
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-05Implemented task EXT-7156 (Appearance panel: "Wear" button should become ↵Vadim Savchuk
disabled and a loading indicator should appear next to the outfit name). When user presses the "Wear" button in the outfits list, we disable the button and display a perpetual loading indicator until all wearables of the outfit being worn get loaded. Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/347/ --HG-- branch : product-engine
2010-04-30Implemented task EXT-6559 (Appearance panel: Add edit button in place of the ↵Vadim Savchuk
image display next to current look). - Changed the topmost part of the Appearance panel: * Added new "Edit current outfit" button. * Implemented COF status display (unsaved/wearing) according to the spec. * Minor XUI changes (font / dimensions / bg color). - Removed the temporary "Edit current outfit" button from the bottom of the Appearance panel. - Removed the temporary "ShowDebugAppearanceEditor" setting. TODO: use icons from the spec (currently missing). Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/339/ --HG-- branch : product-engine
2010-04-29(EXT-6722) Create modified inventory view for "my outfits" tab in top-level ↵Sergei Litovchuk
appearance sidebar (tier 2) llui: - Added accordion tab title setter. - Added setters for accordion tab focus changes callbacks. newview: - Fixed observer used for outfit items collecting. Added checking number of fetched items. - Added outfit selection and enabled "replace outfit" and "add to outfit" commands for selected outfit. Reviewed by Mike Antipov https://codereview.productengine.com/secondlife/r/332/ --HG-- branch : product-engine
2010-04-21Implemented by SL EXT-6722(normal task) - Create modified inventory view for ↵Dmitry Zaporozhan
"my outfits" tab in top-level appearance sidebar (tier 1) llui: - Setting container panel for accordion tab control to dynamically add tabs to accordions. - Added method to dynamically remove accordion tabs. - Added LLIconCtrl image setter. newview: - Class LLOutfitsList - a list of agents's outfits from "My Outfits" inventory category which represents each outfit by an accordion tab with a list of items inside it. - Class LLWearableItemsList - a list of wearable items used in each accordion tab of "My Outfits" tab. - Class LLInventoryItemsList - a base class for LLWearableItemsList that represents inventory items by panels in LLFlatListView. - Class LLPanelInventoryItem - inventory item representation for a flat list. Item icon is set according to item type. - Class LLInventoryCategoriesObserver - an observer used in LLOutfitsList for monitoring changes to "My Outfits" inventory category and updating outfits accordion tabs and list of items for each outfit. Known issues: - Only first outfit tab is displayed in "My Outfits" until this tab is expanded. - Bottom bar buttons and filter field not functioning for "My Outfits" tab since LLOutfitsList still doesn't support selection, filtering and sorting. - "My Outfits" and "Wearing" tabs of "Appearance" side panel might need a common interface to use LLOutfitsList and LLinventoryPanel as tabs in LLPanelOutfitsInventory or "Wearing" tab should be replaces with LLOutfitsList class object i.e. a flat list. On review - https://codereview.productengine.com/secondlife/r/285/ --HG-- branch : product-engine
2010-04-21completed EXT-6719 Utilize the "description" field of outfit wearable links ↵Igor Borovkov
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-09done EXT-6687 Implement Save button functionality (Edit Outfit panel)Igor Borovkov
Implemented "Save", "Save as new" functionality. If the base outfit doesn't exist "Save as new" functionality is employed Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/179 --HG-- branch : product-engine
2010-04-06Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-04-02automated mergeLoren Shih
2010-04-02mergeIgor Borovkov
--HG-- branch : product-engine
2010-04-02done EXT-6674 Switch Edit Outfit panel (list at the top) to show content of ↵Igor Borovkov
the Current Outfit system folder reviewed at https://codereview.productengine.com/secondlife/r/159/ --HG-- branch : product-engine
2010-04-01EXT-5110 Save Outfit dialog is non-standard modal dialog (off-center ↵Leyla Farazha
placement, empty titlebar) reviewed by Richard CC#176
2010-04-01EXT-6679 : INFRASTRUCTURE : Have LLInvFVBridge contain a LLFolderView *mRoot ↵Loren Shih
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-01EXT-4084 : Change LLInventoryBridge "LLFolderView* folder" to "LLFolderView ↵Loren Shih
*rootFolder" Superficial cleanup - changed all instances to "LLFolderView* root".