summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerassetupload.cpp
AgeCommit message (Collapse)Author
2024-05-15Merge branch 'main' into marchcat/x-mf-mergeAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llfloaterimagepreview.cpp
2024-05-15Post-merge spaces fixAndrey Lihatskiy
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
LF, and trim trailing whitespaces as needed
2024-04-13viewer#1081 Add expected price to upload's bodyAndrey Kleshchev
2024-01-09SL-20779 More reliable decode and encode error logging (#615)Andrey Kleshchev
2023-11-30Merge branch 'DRTVWR-591-maint-X' into marchcat/591-x-pbr-mergeAndrey Lihatskiy
# Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llvertexbuffer.cpp # indra/llui/llflatlistview.cpp # indra/newview/app_settings/settings.xml # indra/newview/lldrawpoolground.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorygallery.cpp # indra/newview/llspatialpartition.cpp # indra/newview/llviewercontrol.cpp # indra/newview/llviewertexture.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/xui/en/menu_inventory.xml
2023-11-30Merge branch 'DRTVWR-588-maint-W' into marchcat/588-w-pbr-mergeAndrey Lihatskiy
# Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llvertexbuffer.cpp # indra/llui/llflatlistview.cpp # indra/newview/lldrawpoolground.cpp # indra/newview/llspatialpartition.cpp # indra/newview/lltexturefetch.cpp # indra/newview/llviewergenericmessage.cpp # indra/newview/llviewertexture.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml # indra/newview/skins/default/xui/en/floater_stats.xml # indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml # indra/newview/skins/default/xui/en/notifications.xml # indra/newview/skins/default/xui/en/panel_performance_preferences.xml
2023-10-11SL-20419 Receiving new objects or items, etc causes inventory to switch from ↵Alexander Gavriliuk
recent to my inventory tab
2023-10-11SL-20419 Receiving new objects or items, etc causes inventory to switch from ↵Alexander Gavriliuk
recent to my inventory tab
2023-03-29Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-01-12Merge branch 'main' into DRTVWR-573-maint-RAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/newview/llagent.cpp # indra/newview/llimview.cpp # indra/newview/llimview.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llpanelmediasettingsgeneral.cpp # indra/newview/pipeline.cpp
2022-12-12Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
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-11-03SL-18492 Switch inventory script compiler default from LSO to monoMnikolenko Productengine
2022-10-21Merge branch 'master' (DRTVWR-548) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llrendertarget.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloaterpreference.cpp # indra/newview/llviewercontrol.cpp # indra/newview/llviewermenu.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp
2022-10-20Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-07-20SL-17690 Uploaded material asset references wrong texture UUIDsAndrey Kleshchev
Upload textures first, then get ids and upload material on callback
2022-07-19SL-17670 Simplify outfit snapshot floaterMnikolenko Productengine
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
2022-05-18SL-10163 - allow joint aliases in animation uploads. Names are canonicalized ↵Brad Payne (Vir Linden)
before sending to simulator. # Conflicts: # indra/newview/llviewerassetupload.cpp # indra/newview/llvoavatar.cpp # scripts/content_tools/anim_tool.py
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 ↵Brad Payne (Vir Linden)
animations containing invalid joint names # Conflicts: # indra/newview/llviewerassetupload.cpp # indra/newview/llvoavatar.cpp
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 23:38:31 +0000