summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenufile.cpp
AgeCommit message (Collapse)Author
2021-02-03Merge with Master after Viewer releaseCallum Prentice
2020-11-19SL-13487 File extension checks should ignore caseMnikolenko Productengine
2020-10-14Mostly automatic merge with canonical viewer after releaseCallum Prentice
2020-10-14Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
2020-09-24Complete the change from lldiskcache -> llfilesystem and then addition of ↵Callum Prentice
new lldiskcache implementation
2020-09-16Renamed the references to LLVFile and llvfile.* source code plus cmake ↵Callum Prentice
scripts to use a different name - lldiskcache - since that more closely resembles what it is (or will be) now that the VFA is no more
2020-09-16First part of change to remove LLVFS from the Viewer. Consists of code ↵Callum Prentice
changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change.
2020-08-19SL-11898 Restored the code lost on mergeAndrey Lihatskiy
2020-08-18BuildfixAndrey Lihatskiy
2020-08-18Merge branch 'master' into DRTVWR-482Andrey Lihatskiy
2020-08-18Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llimprocessing.cpp # indra/newview/llviewerjoystick.cpp # indra/newview/llviewermenufile.cpp
2020-06-01SL-13346 Hi-Res snapshots save a zoomed portion on 4K+ resolutionsAndrey Kleshchev
2020-05-12SL-13189 Mesh uploader - Autofill from _postfixesMnikolenko Productengine
2020-04-29Merge branch 'DRTVWR-500' into DRTVWR-501-maintAndrey Lihatskiy
2020-03-28Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
2020-03-18Merge master (v 6.3.9) into DRTVWR-440Dave Houlton
2019-12-09SL-12414 The "Bulk" upload warning message for .bhv files is confusingandreykproductengine
2019-11-20SL-10499 - handle package info from benefits serviceBrad Payne (Vir Linden)
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-11-15SL-11898 Hi-res snapshots do not support UI and HUDs and should not show themandreykproductengine
2019-11-15SL-10499 - benefits. Removed no-longer-needed lleconomy files and classes. ↵Brad Payne (Vir Linden)
Group-related costs and limits via benefits.
2019-05-08Fix merge fail.Graham Linden
2019-05-08Merge viewer-releaseGraham Linden
2019-01-14SL-10291 Replace apr_mutex with standard C++11 functionalityandreykproductengine
2018-09-26MergeRider Linden
2018-08-03MergeRider Linden
2018-07-27MAINT-8924 FIXED Outfit snapshot upload closes inventorymaxim_productengine
2018-06-21Compile issue with merge. Just use the method default parameters.Rider Linden
2018-06-21MergeRider Linden
2018-05-31MAINT-8700 Remove obsolete code and update 'Save texture' file dialogmaxim_productengine
2018-05-30MAINT-8700 FIXED The File dialog disconnects the viewer if you do not choose ↵maxim_productengine
upload files within the first minute
2018-06-12MAINT-8727 FIXED Saving snapshot will cause disconnect if you do not choose ↵maxim_productengine
path in File picker quickly
2018-04-17MAINT-8325 Fixed The Save Local dialog disconnects the viewer if you do not ↵andreykproductengine
choose the save directory files within the first minute
2018-05-22MAINT-8635 Don't allow using 'close all windows' if modal toast is openmaxim_productengine
2018-02-26Added settings inventory object with subtypeRider Linden
2017-09-13MAINT-7794 Wrap getCapability(..) calls to avoid crashesMnikolenko Productengine
2017-05-24MAINT-4375 Viewer saves an empty snapshots if disk is fulldaianakproductengine
2016-11-14Merged in lindenlab/viewer-cleanupAndreyL ProductEngine
2016-10-28MAINT-6875 Viewer crashes after double clicking on Upload>MeshMnikolenko Productengine
2016-10-07MAINT-6800 FIXED Using Snapshot Freeze Frame option causes several issuesMnikolenko Productengine
2016-09-16Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2016-08-30MAINT-5232: LLGlobalEconomy is now an LLSingleton.Nat Goodspeed
It used to contain an LLSingleton called Singleton, requiring LLGlobalEconomy::Singleton::instance() to access it rather than the conventional LLGlobalEconomy::instance(). This has been fixed, so normalize references accordingly.
2016-06-03mac build fixMnikolenko ProductEngine
2016-06-02MAINT-5194 Visual Outfit browserpavelkproductengine
Made refactoring of LLFloaterOutfitSnapshot and LLFloaterSnapshot
2016-05-24Merge VOB with release 4.0.6pavelkproductengine
2016-05-10Merged in oz_linden/maint-5974Mnikolenko Productengine
2016-04-29MAINT-6226 Incorporate a customized Snapshot feature to Outfit Browser flowpavelkproductengine
Initial version, further refactoring pending
2016-04-04merge with 4.0.3-releaseOz Linden
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-09-14MAINT-5507: Remove HTTPClient and related cruft.Rider Linden