summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerassetupload.cpp
AgeCommit message (Expand)Author
2024-06-10Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into project/gltf_de...Brad Linden
2024-06-01Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible...Ansariel
2024-05-23Merge remote-tracking branch 'origin/project/gltf_development' into brad/merg...Brad Linden
2024-05-23Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-main...Brad Linden
2024-05-22Fix line endlingsAnsariel
2024-05-22Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-AAnsariel
2024-05-20#1392 GLTF Upload (#1394)Dave Parks
2024-05-06Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into gltf-dev-maint-...RunitaiLinden
2024-05-01Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-mergeAndrey Lihatskiy
2024-04-29#824 Process source files in bulk: replace tabs with spaces, convert CRLF to ...Andrey Lihatskiy
2024-04-13viewer#1081 Add expected price to upload's bodyAndrey Kleshchev
2024-04-11Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-m...Ansariel
2024-02-21Convert remaining BOOL to boolAnsariel
2024-01-09SL-20779 More reliable decode and encode error logging (#615)Andrey Kleshchev
2023-12-21SL-20743 Use LLMutex in LLImageBase for internal data thread-safetyAlexander Gavriliuk
2023-11-30Merge branch 'DRTVWR-591-maint-X' into marchcat/591-x-pbr-mergeAndrey Lihatskiy
2023-11-30Merge branch 'DRTVWR-588-maint-W' into marchcat/588-w-pbr-mergeAndrey Lihatskiy
2023-10-11SL-20419 Receiving new objects or items, etc causes inventory to switch from ...Alexander Gavriliuk
2023-10-11SL-20419 Receiving new objects or items, etc causes inventory to switch from ...Alexander Gavriliuk
2023-03-29Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-01-12Merge branch 'main' into DRTVWR-573-maint-RAndrey Lihatskiy
2022-12-12Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2022-12-07SL-18777 PBR upload was stuck waiting for textureakleshchev
2022-11-03SL-18492 Switch inventory script compiler default from LSO to monoMnikolenko Productengine
2022-10-21Merge branch 'master' (DRTVWR-548) into DRTVWR-559Andrey Kleshchev
2022-10-20Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-07-20SL-17690 Uploaded material asset references wrong texture UUIDsAndrey Kleshchev
2022-07-19SL-17670 Simplify outfit snapshot floaterMnikolenko Productengine
2022-06-29SL-17602 WIP - Texture uploads form material editor now work but the names ar...Dave Parks
2022-05-18SL-10163 - allow joint aliases in animation uploads. Names are canonicalized ...Brad Payne (Vir Linden)
2022-05-18SL-288, SL-10163 - error reporting for animation upload failures.Brad Payne (Vir Linden)
2022-05-18SL-288, SL-10163 - allow joint aliases, but otherwise reject upload of animat...Brad Payne (Vir Linden)
2021-11-16Merge branch 'master' into DRTVWR-519Andrey Lihatskiy
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and re...Callum Prentice
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)
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 ta...Mnikolenko Productengine
2020-10-06Add in the C++ filesystem based cache and clean up some indempotent functions...Callum Prentice
2020-09-24Complete the change from lldiskcache -> llfilesystem and then addition of new...Callum Prentice
2020-09-16Renamed the references to LLVFile and llvfile.* source code plus cmake script...Callum Prentice
2020-09-16First part of change to remove LLVFS from the Viewer. Consists of code change...Callum Prentice
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 uploa...Mnikolenko Productengine
2019-11-19SL-10499 - Fixes for benefits info and upload, especially bulk uploadBrad Payne (Vir Linden)