summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenufile.cpp
AgeCommit message (Expand)Author
2020-10-14Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2020-09-23SL-13814 Updated label textMnikolenko Productengine
2020-08-18Merge branch 'master' into DRTVWR-482Andrey Lihatskiy
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 up...Brad Payne (Vir Linden)
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. Gr...Brad Payne (Vir Linden)
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
2018-06-12MAINT-8727 FIXED Saving snapshot will cause disconnect if you do not choose p...maxim_productengine
2018-04-17MAINT-8325 Fixed The Save Local dialog disconnects the viewer if you do not c...andreykproductengine
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
2016-06-03mac build fixMnikolenko ProductEngine
2016-06-02MAINT-5194 Visual Outfit browserpavelkproductengine
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
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
2015-07-23Remove unused code and llassetuploadresponders files.Rider Linden
2015-07-20Forgot to remove an unused varable and renamed NewFileResourceUploadInfo to L...Rider Linden
2015-07-15LSL Script upload from inventory.Rider Linden
2015-07-10Merge restore of more selfless changesNat Goodspeed
2015-07-10Backed out changeset bab1000e1b2d: restore 'selfless' changesNat Goodspeed
2015-07-07Automated merge with bundle:C:\Users\admin\AppData\Local\Temp\0d1ig3y4.ke0Rider Linden
2015-07-07MergeRider Linden
2015-07-07Backout selfles merge 738255dbbfd679d9e615baab3398e5e345bbb3c5Rider Linden
2015-07-07Clean up viewrmenufile into viewrassetuplodRider Linden