summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
AgeCommit message (Collapse)Author
2010-06-25Merged from viewer-releaseDessie Linden
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-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-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-14mergeDave Parks
2010-06-14mergeDave Parks
2010-06-14EXT-6571 WIP - fixes for handling of late arriving assetsBrad Payne (Vir Linden)
2010-06-13mergeTofu Linden
2010-06-11Merged from viewer-releaseDessie Linden
2010-06-11Merged from viewer-releaseDessie Linden
2010-06-11MergeDessie Linden
2010-06-11MergeDessie Linden
2010-06-11mergeBrad Payne (Vir Linden)
2010-06-11mergeBrad Payne (Vir Linden)
2010-06-11Merge from 2.1 Alpha tagDessie Linden
2010-06-11EXT-6571 WIP - adding ability to handle late-arriving assetsBrad Payne (Vir Linden)
2010-06-10mergeDave Parks
2010-06-10Enable meshes.Dave Parks
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-10Add "LL_MESH_ENABLED" preprocessor flag for toggling mesh code. Couple of ↵Dave Parks
merge fixes.
2010-06-09mergeVadim Savchuk
--HG-- branch : product-engine
2010-06-09mergeVladimir Pchelko
--HG-- branch : product-engine
2010-06-09EXT-7640 FIXED Added new option to viewer avatar height that allows users to ↵Vladimir Pchelko
see their height in either feet or meters Feature details: Added new property HeightUnits. Implemented logic that build TextBox label correctly according to document https://docs.google.com/a/productengine.com/Doc?docid=0AXxJWUubGIsoZGhqZDcya3JfMWdybXNwdGd0&hl=en -> 'Mockup - Edit Shape' Reviewed by Vadim Savchuk, Neal Orman, Mike Antipov at https://codereview.productengine.com/secondlife/r/531/ --HG-- branch : product-engine
2010-06-09merge from PE's viewer-releaseTofu Linden
2010-06-08Merge with viewer-experimentalDave Parks
2010-06-08EXT-6655 Fixed Made the default busy message repsonse localizable with ↵Andrew Dyukov
already existing account settings - The root of busy response problem is that this text is located in non-localizable xml and, to make things worse, may be changed by user. So usual translation approach is little help here. So busy response was set the following way(EXT-5885)- on first run, string was written there from strings xml and was never changed later without direct user actions. So after changin locale message always remained the same. - To make this string localize each time locale is changed and if it is the same as default message, new setting was added- BusyResponseChanged which is TRUE if user's busy message differ's from default. If it is true, we do nothing when locale changes, otherwise we set default message from current locale as user's busy message. - Old transitional code from DEV-24146 was removed in this diff including unnecessary "BusyModeResponse2" setting(it is not needed because we'll anyway have to set busy message to default after first run of viewer after this fix and now busy response will be stored in "BusyModeResponse"). Warning! If user modified busy response message before this fix, it will be reset to default after first postfix run. Reviewed by Richard Linden at https://codereview.productengine.com/secondlife/r/350/ --HG-- branch : product-engine
2010-06-08merge from PE's viewer-releaseTofu Linden
2010-06-08EXT-7504 WIP Force decloud after timeout using lower res texturesLoren Shih
Reduced LowResTextures timeout from 3 to 2 minutes.
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-07Merge with render-pipelineDave Parks
2010-06-07Merge from viewer-publicDessie Linden
2010-06-07Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicLynx Linden
2010-06-05merge from viewer-publicTofu Linden
2010-06-05merge from viewer-publicTofu Linden
2010-06-04Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicXiaohong Bao
2010-06-04merge from viewer-publicTofu Linden
2010-06-04merge from viewer-publicTofu Linden
2010-06-04Normal debug display and fix for bad bump mapping and planar texture ↵Dave Parks
coordinates.