summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerassetupload.cpp
AgeCommit message (Collapse)Author
2021-11-16Merge branch 'master' into DRTVWR-519Andrey Lihatskiy
# Conflicts: # README.md
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and ↵Callum Prentice
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-09Merge with master before reseting to revert (revert) and get back to D519 statusCallum Prentice
2021-03-09Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵Brad Payne (Vir Linden)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
2021-03-04SL-14941 FIXED Cannot upload large images on the Simplified Cache Viewer.Mnikolenko Productengine
2021-03-02Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
2021-02-03Merge with Master after Viewer releaseCallum Prentice
2021-02-01Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
2020-12-07SL-1777 FIXED Uploading Image or Saving Snapshot while in Inventory Recent ↵Mnikolenko Productengine
tab jumps to Main tab
2020-10-06Add in the C++ filesystem based cache and clean up some indempotent ↵Callum Prentice
functions in llfilesystem
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-06-19SL-13487 File extension checks should ignore caseMnikolenko Productengine
2020-03-18Merge master (v 6.3.9) into DRTVWR-440Dave Houlton
2019-11-25SL-12097, SL-12098, SL-12099 UI update for Texture, Animation and Sound ↵Mnikolenko Productengine
upload fees
2019-11-19SL-10499 - Fixes for benefits info and upload, especially bulk uploadBrad 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-10499 - benefits. Removed no-longer-needed lleconomy files and classes. ↵Brad Payne (Vir Linden)
Group-related costs and limits via benefits.
2019-11-14SL-10499, SL-10497 - use LLAgentBenefits infoBrad Payne (Vir Linden)
2018-09-26MergeRider Linden
2018-08-24Finish dirty and close warning for fixed environment editors.Rider Linden
2018-07-27MAINT-8924 FIXED Outfit snapshot upload closes inventorymaxim_productengine
2018-06-21MergeRider Linden
2018-05-31MAINT-8702 FIXED Uploading any item results in opening previous Item Profile ↵maxim_productengine
instead of Inventory Floater
2018-05-22MergeRider Linden
2018-03-22MAINT-8403 Restore fail case for general upload snapshotmaxim_productengine
2018-03-21MAINT-8403 FIXED "Snapshot" is stuck and not responding after sending ↵maxim_productengine
snapshot via e-mail
2018-03-07MergeRider Linden
2018-02-26Added settings inventory object with subtypeRider Linden
2017-12-04MAINT-7993 Fixed on uploading inventory will show up but won't display ↵andreykproductengine
uploaded item
2017-05-04MAINT-7210 Improving notification for Image upload failuresandreykproductengine
2017-04-27MAINT-7210 Increased timeout for asset uploadsandreykproductengine
2017-01-17MAINT-6959 Ability to set custom folders for uploading itemsandreykproductengine
2016-12-01MAINT-6974 FIXED '[ERROR_MESSAGE]' dialog is shown if try to bulk apload any ↵Mnikolenko Productengine
.txt file
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-08-16Merge VOB with 4.0.8-releasepavelkproductengine
2016-06-02MAINT-5194 Visual Outfit browserpavelkproductengine
Made refactoring of LLFloaterOutfitSnapshot and LLFloaterSnapshot
2016-04-08MAINT-6320 Snapshot floater is stuck in 'Saving to Inventory' state.andreykproductengine
2015-10-09SL-230: Azumarill viewer was incorrectly swallowing upload errors returned ↵Rider Linden
from the server. Correctly report errors and use upload cost provided by server.
2015-09-18Pref instance() over getInstance()Rider Linden
2015-09-18Set consistent terminology for yield/wait -> suspend for coroutines.Rider Linden
2015-07-28Named pools of coroutines.Rider Linden
2015-07-23AR Reports now use coroutines.Rider Linden
2015-07-22MAINT-5357: Added yield between prepare and post in upload.Rider Linden
Removed some commented out code I had missed earlier Moved costing to virtual function in uploadinfo.
2015-07-22Clean up for postcard post.Rider Linden
2015-07-20Forgot to remove an unused varable and renamed NewFileResourceUploadInfo to ↵Rider Linden
LLNewFileResourceUploadInfo
2015-07-20Remove old "compile queue" and replace with the coroutine based upload queue.Rider Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-24 17:22:05 +0000