summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/menu_inventory_add.xml
AgeCommit message (Collapse)Author
2024-04-09Merge remote-tracking branch 'origin/main' into release/materials_featuretteBrad Linden
2024-04-01viewer#1081 Account for 2K texture upload price in material and texture uploadAndrey Kleshchev
2023-11-30Merge branch 'DRTVWR-588-maint-W' into marchcat/588-w-pbr-mergeAndrey Lihatskiy
# Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llvertexbuffer.cpp # indra/llui/llflatlistview.cpp # indra/newview/lldrawpoolground.cpp # indra/newview/llspatialpartition.cpp # indra/newview/lltexturefetch.cpp # indra/newview/llviewergenericmessage.cpp # indra/newview/llviewertexture.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml # indra/newview/skins/default/xui/en/floater_stats.xml # indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml # indra/newview/skins/default/xui/en/notifications.xml # indra/newview/skins/default/xui/en/panel_performance_preferences.xml
2023-11-24Suggestions for fixing problems in xui/en XML files (#534)Yuzuru Jewell
Co-authored-by: Yuzuru Kato <pascal.imac@gmail.com> Co-authored-by: Andrey Lihatskiy <alihatskiy@productengine.com>
2023-10-03Merge branch 'main' (DRTVWR-567) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/VIEWER_VERSION.txt # indra/newview/llagent.cpp # indra/newview/llfloaternewfeaturenotification.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorymodel.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/llpanelmaininventory.cpp # indra/newview/llpanelmaininventory.h # indra/newview/llsidepaneltaskinfo.cpp # indra/newview/llsidepaneltaskinfo.h # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/llviewerinventory.cpp # indra/newview/llviewerobject.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llviewertexturelist.h # indra/newview/skins/default/xui/en/floater_new_feature_notification.xml # indra/newview/skins/default/xui/en/menu_inventory.xml
2023-04-06SL-19550 Add a shop menu item to the Inventory menuMaxim Nikolenko
2022-12-01SL-18742 Upload materials option is missing from inventory's menuAndrey Kleshchev
2022-11-18SL-18677 Disable materials UI when materials caps are not availableAndrey Kleshchev
2022-06-14SL-17586 WIP -- LLMaterialEditor prototype and "New Material" inventory buttons.Dave Parks
2020-03-18Merge master (v 6.3.9) into DRTVWR-440Dave Houlton
2019-11-18SL-10499 - bulk upload behavior adjusted to account for possibly different ↵Brad Payne (Vir Linden)
upload prices for different asset types. Also added a confirmation dialog for bulk upload.
2019-08-26Merge 6.3.1 viewer-releaseGraham Linden
2018-07-09Attempting to create a settings inventory item on a non-eep region will now ↵Rider Linden
show a visible failure message to the user. Menu items for greating settings in inventory are disabled on non eep regions.
2018-06-08[DRTVWR-476] - create new wearable typeAnchor Linden
2018-05-03Inventory context menus and increment attrib for settings panels.Rider Linden
2015-11-10remove execute permission from many files that should not have itOz Linden
2013-11-19merge up to 3.6.10-release; some of the storm-68 changes lostOz Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-01-23STORM-68 STORM-68 Remove obsolete menu entry for default uploads.Jonathan Yap
Remove two matching entries in settings.xml (the other three were already eliminated). Adjust default permissions for new notecards and gestures to C/M/T (the current default).
2012-10-17MAINT-1724 : Viewer crashes while attempt to open '+ inventory' floatersimon@Simon-PC.lindenlab.com
that already opened in separated floater. Changed to non-tearable menu. Reviewed by Kelly
2012-01-16EXP-1758 WIP Progress spinner not shown during merketplace synch if Merchant ↵Richard Linden
Outbox floater was previously minimized rewrote layout_stack resizing logic to be symmetrical
2011-07-11mergeprep
2011-07-11SH-2012: removed upload wizard from inventory '+' menuprep
2011-06-20EXP-917 FIX -- Inbox and Outbox options shown in the + Menu in the Inventory ↵Leslie Linden
Panel Oops.
2011-06-08Merge from viewer-experienceLeslie Linden
2011-05-31adding inbox/outbox creation optionsLeyla Farazha
2011-05-17SH-1506 FIXED "Upload Wizard" is missing from Inventory's add menuLoren Shih
2011-05-16SH-1506 "Upload Wizard" is missing from Inventory's add menuLoren Shih
2011-04-04Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-01-26SH-842 Hide "Model" option in upload menuleyla_linden
2010-08-23Created new wearable type.Loren Shih
Added debug setting for disabling physics. Added disable-multiwear and disable-camera-reset to wearabletype.
2010-07-27Backed out changeset: 58571b4e704bRichard Linden
2010-07-15Reverted changeset 2bb10eae42bfDessie Linden
2010-07-14mergeDave Parks
2010-07-12EXT-7884 (\"Set Default Upload Permissions\" may make more sense in the ↵Andrew Polunin
Upload sub-menu) - In viewer menu 'Set Default Upload Permissions' menu item was moved from 'Options' menu to the 'Upload' menu. - 'Set Default Upload Permissions' menu item was added to the inventory menu. - Removed stray separators. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/734/ --HG-- branch : product-engine
2010-05-11Hide mesh UI when MeshEnabled is set to false.Dave Parks
2010-03-17Disable fast alpha by default. Pull scene importer option from upload menu.Dave Parks
2010-02-28Remove some dead code.Dave Parks
Add LH transform to LLVector3 Add DebugShowUploadCost Make LOD generation on model preview less finnicky. Remove error level based LOD generation. Better framing of model before upload. Better error handling for model uploader. Remove [COST] argument from model upload menu item. Remove L$ check from model upload menu item being enabled.
2010-02-18viewer2 merge.Tofu Linden
2010-02-18EXT-5461: Reverting change 49e628c3a0c5.Lynx Linden
Renaming skins/base back to skins/default to unblock I10n. Revert was requested by Q.
2010-02-17EXT-5461 - Installing 1.23.5 release version over recent 2.0 builds corrupts ↵Richard Linden
1.23s UI reviewed by Leyla
2010-01-05ext-3914 [BSI] Inconsistent terminology for "notecard"Lis Linden
2009-11-05EXT-2277 : Bottom panel for Inventory viewLoren Shih
"Add" button menu for bottom panel. --HG-- branch : avatar-pipeline
2009-11-05EXT-2277 : Bottom panel for Inventory viewLoren Shih
Adds gear menu, add button, trash. --HG-- branch : avatar-pipeline
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-20 10:52:43 +0000