summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
AgeCommit message (Collapse)Author
2010-08-06EXT-8577 WIP Context menu items for multi-attachments.Vadim Savchuk
Done: - 1. Dropped the obsolete "MultipleAttachments" setting. - 2. Added an "Add" item to the following attachment-related context menus: * My Appearance (ex-My Outfits) context menu. * Edit Outfit -> Add More context menu. * Object in-world context menu. * Inventory context menu. * Object inspector gear menu. - 3. Modified "Attach To / Attach To HUD" to perform the "add" instead of "replace" action. TODO: - Ability to attach multiple objects at once from the Add More panel (bulk attach). - Make sure there's no memleak when you click Wear/Attach in the in-world object context menu and the callback isn't invoked (because e.g. avatar fails to get close enough to the object). Issues: 0. I'm not sure whether LLAgentWearables::userAttachMultipleAttachments() should replace attachments or add them. Assumed the former. 1. I couldn't verify that adding objects from the object inspector menu works because I either could wear an object or see its inspector, not both. 2. > 1. Right-click on an object in your inventory and select "Wear". > VERIFY: Attaches the object and replaces whatever's there; asks for > confirmation before replacing an existing object. I think this is impossible to implement because we don't know in advance what point the object will be attached to, so we can't display a confirmation dialog. Reviewed by Seraph at https://codereview.productengine.com/secondlife/r/843/ --HG-- branch : product-engine
2010-08-02EXT-7676 FIXED Restored fix (47df1b3fd94e) reverted in merge 5b5cc4a8642d ↵Sergei Litovchuk
with slight modifications. - Replaced pointers passed to 'Add More' gear menu with LLHandle. - Removed storing 'Add More' panel sort order from settings because the order is changed each time the panel opens. - Replaced creating items comparator in LLPanelOutfitEdit::postBuild() with a static comparator in llwearableitemslist.cpp. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/826/. --HG-- branch : product-engine
2010-07-27Merge from dessie/viewer-releaseRichard Linden
2010-07-27Backed out changeset: 58571b4e704bRichard Linden
2010-07-20mergeRichard Nelson
2010-07-15EXT-8135 FIXED Textures blurry when in Appearance Edit modeLoren Shih
EXT-8445 Reduce baked texture timeout fro 120sec to 60sec default Also did some minor infrastructure cleanup, added code comments, etc. There is now separate logic for determining how to handle update (versus upload) requests. Also made a trivial change to llvoavatar to properly encapsulate mAppearanceAnimating. Also reduced the baked texture timeout to 60s (in settings.xml)
2010-07-15Reverted changeset 2bb10eae42bfDessie Linden
2010-07-15merge from PE's viewer-trunk (viewer-public)Tofu Linden
2010-07-14Merged from viewer-releaseDessie Linden
2010-07-13Manual merge from default branchVadim Savchuk
Resolved conflicts in llpaneloutfitedit.cpp --HG-- branch : product-engine
2010-07-13EXT-7639 FIXED (Make shop button open different URLs depending on what is ↵Andrew Polunin
selected in outfit editor) - Fixed old market place URL to the new one in the settings.xml. - Implemented the following feature: \"When Add More panel in focus selection inside it should supersede selection in accordions\". To achieve this: -- LLPanelOutfitEdit::getCOFWearablesSelectionType() function was implemented. -- LLPanelOutfitEdit::getAddMorePanelSelectionType() function was implemented. -- LLPanelOutfitEdit::getWearableTypeByItemUUID(const LLUUID& item_uuid) function was implemented. -- LLPanelOutfitEdit::onShopButtonClicked() was rewritten to use those functions. - Fixed the problem with shop button and gender: now shop button for male leads to male links. Reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/725/ --HG-- branch : product-engine
2010-07-13Merged from viewer-releaseDessie Linden
2010-07-12EXT-8274 FIXED Avoided message truncation on tip toasts.Alexei Arabadji
Details: Made max message line count configurable and by default 10 lines. reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/730/ --HG-- branch : product-engine
2010-07-08Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-07-07Merged from viewer-releaseDessie Linden
2010-07-06Merged from viewer-release after resolving conflictsDessie Linden
2010-07-06Updated static cache files from hg.lindenlab.com/vir/viewer-cacheBrad Payne (Vir Linden)
2010-07-06Added back static VFS cache, removed artwork-common tarball (which is ↵Brad Payne (Vir Linden)
currently only used for those two smallish files)
2010-07-01Watchdog thread configurable though feature table; user config value will ↵Andrew A. de Laix
still take precedence.
2010-07-01Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-06-30Merged from viewer-releaseDessie Linden
2010-06-30Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-06-29DEV-35247 - Update CA.pem according to instructions from MarkFKent Quirk
2010-06-29EXT-7676 FIXED Added items sorting from gear menu for 'Add Wearable'.Sergei Litovchuk
- Added new gear menu when 'Add Wearable' panel is open in 'Edit Outfit'. - Added wearable items list comparator to sort by wearable creation date. - Added storing sorting type in viewer settings. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/661/. --HG-- branch : product-engine
2010-06-29Merged from viewer-releaseDessie Linden
2010-06-28Porting VBO changes from davep/viewer-release.Dave Parks
Better usage of LLVertexBuffer::sEnableVBOs. Added RenderUseStreamVBO debug setting for controlling usage of VBOs for particles/avatars/etc.
2010-06-28VWR-7054 FIXED Flycam movement in build mode is reduced.Aimee Linden
Removed hard coded scaling of movements when in build mode, made it a debug setting defaulted to 1 to disable it.
2010-06-28EXT-7498 WIP Snapshot SharingAimee Linden
Reviewed by Tofu.
2010-06-25Merged from viewer-releaseDessie Linden
2010-06-24EXT-7747 FIXED Turn on multiattachments for 2.1 as debug settingLoren Shih
This #ifdef is now keyed to MultipleAttachments debug setting
2010-06-21Merge from ssh://hg.lindenlab.com/dessie/viewer-releaseLeyla Farazha
2010-06-18EXT-7910 allow GPU and feature table to load from a custom locationKarl Stiefvater (qarl)
2010-06-17Merge (and resolve conflict) from q/viewer-releaseKent Quirk
2010-06-17Merged from q/viewer-releaseDessie Linden
2010-06-16Automated merge with ssh://hg.lindenlab.com/q/viewer-releaseXiaohong Bao
2010-06-16merge from PE's viewer-releaseTofu Linden
2010-06-15removing fullscreen functionalityLeyla Farazha
reviewed by richard cc#212
2010-06-15EXT-6953 FIX - enable new walk/run by defaultBrad Payne (Vir Linden)
2010-06-15EXT-7639 FIXED added shop button which reacts according to the ticket ↵Andrew Polunin
description - Added method LLAccordionCtrl::getExpandedTab() which search for the first expanded accordion tab. This method is a bit of hacking, but I discussed it with Vadim Savchuk. - LLAccordionCtrlTab::isExpanded() is made 'const'. This is necessary to call it from getExpandedTab() which is also 'const'. - Added all provided Marketplace URLs (taken from EXT-7257) to the settings.xml. So URLs can be configured without recompilation. - Added method LLCOFWearables::getSelectedItems() which can be used to get ALL selected items (not only one). - Class LLShopURLDispatcher is implemented in the llpaneloutfitedit.cpp. - Added callback LLPanelOutfitEdit::onShopButtonClicked() which calls LLShopURLDispatcher to send user to the correct URL. - Added shop button (shop_btn) widget in panel_outfit_edit.xml. It has invalid icon for now. After review I'm going to reassign the ticket to someone who will provide correct icons. Reviewed by Vadim Savchuk and Mike Antipov at https://codereview.productengine.com/secondlife/r/569/ --HG-- branch : product-engine
2010-06-14EXT-6571 WIP - fixes for handling of late arriving assetsBrad Payne (Vir Linden)
2010-06-11Merged from viewer-releaseDessie Linden
2010-06-11MergeDessie Linden
2010-06-11mergeBrad Payne (Vir Linden)
2010-06-11mergeBrad Payne (Vir Linden)
2010-06-11EXT-6571 WIP - adding ability to handle late-arriving assetsBrad Payne (Vir Linden)
2010-06-10EXT-7760: FIXED: only 10 avatars render non-impostoredXiaohong Bao
2010-06-10EXT-7760: FIXED: only 10 avatars render non-impostoredXiaohong Bao
2010-06-10Merging latest dessie/viewer-release into brad/viewer-publicLynx Linden
2010-06-09mergeVadim Savchuk
--HG-- branch : product-engine
2010-06-09mergeVladimir Pchelko
--HG-- branch : product-engine