summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
AgeCommit message (Collapse)Author
2010-09-15STORM-86 MERGE Double-click TeleportAimee Linden
2010-09-10Pull from lindenlab/viewer-developmentMerov Linden
2010-09-10merge.Tofu Linden
2010-09-09Pull from lindenlab/viewer-developmentMerov Linden
2010-09-07MergeAimee Linden
2010-09-07VWR-21253 MERGE Permission icons in the friends listAimee Linden
2010-09-02automated merge from viewer-development rootLoren Shih
2010-09-02merge for VWR-1852 VWR-8726 VWR-4232 VWR-22752Tofu Linden
2010-09-01VWR-22759 : port of SNOW-667, Automatic language translation of chat messagesMerov Linden
2010-09-01Automated merge with http://bitbucket.org/TheShining/viewer-developmentXiaohong Bao
2010-09-01code for DEV-52939: viewer's object geometry cache files are not limited in ↵Xiaohong Bao
number, and can also be incorrectly cleared with the VFS cache. reviewed by andrew.
2010-09-01VWR-13221 (SNOW-188) FIXED Allow panning of the minimapAimee Linden
Imported from Snowglobe.
2010-08-31SNOW-683 VWR-8726 : Turn off swirling lights for scripted objectsMerov Linden
2010-08-30pull internationalization fixes from faulty splitOz Linden
2010-08-26VWR-20715 Double-click teleportAimee Linden
SNOW-352/SNOW-421/SNOW-462 Imported from Snowglobe 2 By Twisted Laws and Thickbrick Sleaford
2010-08-26Manual merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-08-24Update GLSL shader sources to current $LicenseInfo$ standard.Nat Goodspeed
See https://wiki.lindenlab.com/wiki/License_Substitution for details.
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-20merge from viewer-releaseTofu Linden
2010-08-18fixed for EXT-8963: investigate if Advanced > Run Multiple Threads should be on.Xiaohong Bao
Removed "Run Multiple Threads" from the menu because we are not using it.
2010-08-19VWR-20734 FIXED Changed parcel properties to default to "on" in the location ↵Vadim Savchuk
bar. Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/870/ --HG-- branch : product-engine
2010-08-18EXT-8673: FIXED: UDP texture loading is slower in 2.x viewers than 1.23.5Xiaohong Bao
Improved the following: 1, make sure the texture callback queue is properly handled and cleaned in time; 2, estimate the LLVOTree pixel area more accurately; 3, eliminate the possibility of back and forth stopping/restarting a texture fetching
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-02Redo the same merge as in changeset "2026f824953f", but this time with ↵Christian Goetze (CG)
feeeeling.
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-30Merge from q/viewer-release to dessie/viewer-release for 2.1.1 beta 1Kent Quirk
2010-07-27Merge from dessie/viewer-releaseRichard Linden
2010-07-27Backed out changeset: 58571b4e704bRichard Linden
2010-07-22EXT-1579 FIXED Show icons representing permissions granted in friends list ↵Aimee Linden
on roll-over. Needs new icon artwork, currently reusing old 1.23 icons.
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