summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerassetupload.h
AgeCommit message (Collapse)Author
11 daysMerge commit '9e24b30' into marchcat/maint-c/restoreAndrey Lihatskiy
# Conflicts: # indra/llmath/v2math.cpp # indra/llmath/v2math.h # indra/llmath/v3math.h # indra/llmath/v4math.h # indra/llui/llfolderviewitem.cpp # indra/llui/llfolderviewitem.h # indra/llui/llfolderviewmodel.h # indra/llui/llmodaldialog.cpp # indra/llui/lltexteditor.cpp # indra/llui/lltexteditor.h # indra/llwindow/llwindowwin32.cpp # indra/newview/llagent.cpp # indra/newview/llagentcamera.h # indra/newview/llavatarrenderinfoaccountant.cpp # indra/newview/llconversationmodel.h # indra/newview/llfloaterinventorysettings.cpp # indra/newview/llfloaternamedesc.cpp # indra/newview/llfloaternamedesc.h # indra/newview/llfloaterobjectweights.cpp # indra/newview/llfloaterobjectweights.h # indra/newview/llfolderviewmodelinventory.h # indra/newview/llinspecttexture.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorybridge.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventorygallery.h # indra/newview/llinventorygallerymenu.cpp # indra/newview/llinventorymodel.cpp # indra/newview/llinventorypanel.cpp # indra/newview/llinventorypanel.h # indra/newview/llmaterialeditor.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitgallery.h # indra/newview/lloutfitslist.cpp # indra/newview/lloutfitslist.h # indra/newview/llpanelgroupcreate.cpp # indra/newview/llpanelgroupgeneral.cpp # indra/newview/llpanelobjectinventory.cpp # indra/newview/llpaneloutfitsinventory.h # indra/newview/llpanelprofile.cpp # indra/newview/llpanelwearing.cpp # indra/newview/llreflectionmap.cpp # indra/newview/llselectmgr.cpp # indra/newview/llsidepanelappearance.cpp # indra/newview/llsidepaneliteminfo.cpp # indra/newview/llteleporthistorystorage.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/lltexturefetch.cpp # indra/newview/lltexturefetch.h # indra/newview/llviewerassetupload.cpp # indra/newview/llviewercamera.cpp # indra/newview/llviewercamera.h # indra/newview/llviewermenufile.cpp # indra/newview/llviewerobject.h # indra/newview/llviewertexture.cpp # indra/newview/llviewerwindow.cpp # indra/newview/llvoavatar.cpp # indra/newview/llvoavatar.h # indra/newview/llvoavatarself.cpp # indra/newview/llvovolume.cpp # indra/newview/llvovolume.h # indra/newview/tests/llviewerassetstats_test.cpp
2024-07-02viewer#1666 Allow switching 2k textures off in bulk uploadsAndrey Kleshchev
2024-06-04viewer#1588 Upload directly to Specified Inventory FolderAndrey Kleshchev
2024-04-29#824 Process source files in bulk: replace tabs with spaces, convert CRLF to ↵Andrey Lihatskiy
LF, and trim trailing whitespaces as needed
2022-12-07SL-18777 PBR upload was stuck waiting for textureakleshchev
Handle obscure upload failure case - floater was waiting for a texture upload indefinetely. Unblock floater if upload fails.
2022-07-20SL-17690 Uploaded material asset references wrong texture UUIDsAndrey Kleshchev
Upload textures first, then get ids and upload material on callback
2022-06-29SL-17602 WIP - Texture uploads form material editor now work but the names ↵Dave Parks
are garbage and the resulting material asset has the wrong UUIDs
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-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.
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-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-14SL-10499, SL-10497 - use LLAgentBenefits infoBrad Payne (Vir Linden)
2018-09-26MergeRider Linden
2018-07-27MAINT-8924 FIXED Outfit snapshot upload closes inventorymaxim_productengine
2018-02-26Added settings inventory object with subtypeRider 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
2015-07-17LSL Compile and upload from task object. Fix auto open when finished on all ↵Rider Linden
uploads...
2015-07-15LSL Script upload from inventory.Rider Linden
2015-07-13Rename the file in VFS with the new asset AID (prevents crash on gesture ↵Rider Linden
change and fixes notecard update)
2015-07-11MAINT-5351: Finish messy merge restoring 'selfless' changes.Nat Goodspeed
2015-07-10Automated merge with ssh://bitbucket.org/rider_linden/maint-4952-v-t-uNat Goodspeed
2015-07-10MAINT-5356: Conversion of Notecards and Gesture to use new coroutine uploading.Rider Linden
Minor reorganization of Upload Info classes.
2015-07-10Merge restore of more selfless changesNat Goodspeed
2015-07-10Backed out changeset bab1000e1b2d: restore 'selfless' changesNat Goodspeed
2015-07-08Convert LLCore::HttpHeaders to use shared_ptr<> rather than an ↵Rider Linden
intrusive_ptr<> for refrence counting.
2015-07-07Automated merge with bundle:C:\Users\admin\AppData\Local\Temp\0d1ig3y4.ke0Rider Linden
2015-07-07Backout selfles merge 738255dbbfd679d9e615baab3398e5e345bbb3c5Rider Linden
2015-07-07Clean up viewrmenufile into viewrassetuplodRider Linden
2015-07-02MergeRider Linden
2015-07-02Adjusting uploadinfo object for expansion.Rider Linden
Commit is prelim to allow merge from selfless.
2015-07-01MAINT-5351: Remove 'self' parameter from coroutine functions.Nat Goodspeed
lleventcoro_test.cpp runs clean (as modified for new API), and all the rest builds clean, but the resulting viewer is as yet untested.
2015-06-30Initial checkin for uploading via coroutine.Rider Linden
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-21 07:30:08 +0000