Age | Commit message (Collapse) | Author | |
---|---|---|---|
2023-11-30 | Merge branch 'DRTVWR-588-maint-W' into marchcat/588-w-pbr-merge | Andrey 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-11 | SL-20419 Receiving new objects or items, etc causes inventory to switch from ↵ | Alexander Gavriliuk | |
recent to my inventory tab | |||
2023-03-29 | Merge remote-tracking branch 'origin/main' into DRTVWR-559 | Brad Linden | |
2023-01-12 | Merge branch 'main' into DRTVWR-573-maint-R | Andrey 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-12 | Merge remote-tracking branch 'origin/main' into DRTVWR-559 | Brad Linden | |
2022-12-07 | SL-18777 PBR upload was stuck waiting for texture | akleshchev | |
Handle obscure upload failure case - floater was waiting for a texture upload indefinetely. Unblock floater if upload fails. | |||
2022-11-03 | SL-18492 Switch inventory script compiler default from LSO to mono | Mnikolenko Productengine | |
2022-10-21 | Merge branch 'master' (DRTVWR-548) into DRTVWR-559 | Andrey 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-20 | Merge branch 'master' into DRTVWR-565-maint-P | Andrey Lihatskiy | |
2022-07-20 | SL-17690 Uploaded material asset references wrong texture UUIDs | Andrey Kleshchev | |
Upload textures first, then get ids and upload material on callback | |||
2022-07-19 | SL-17670 Simplify outfit snapshot floater | Mnikolenko Productengine | |
2022-06-29 | SL-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-18 | SL-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-18 | SL-288, SL-10163 - error reporting for animation upload failures. | Brad Payne (Vir Linden) | |
2022-05-18 | SL-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-16 | Merge branch 'master' into DRTVWR-519 | Andrey Lihatskiy | |
# Conflicts: # README.md | |||
2021-03-09 | This 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-09 | Merge with master before reseting to revert (revert) and get back to D519 status | Callum Prentice | |
2021-03-09 | Merge branch 'master' into DRTVWR-522-maint | Andrey Lihatskiy | |
2021-03-08 | Revert "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-04 | SL-14941 FIXED Cannot upload large images on the Simplified Cache Viewer. | Mnikolenko Productengine | |
2021-03-02 | Merge branch 'master' into DRTVWR-522-maint | Andrey Lihatskiy | |
2021-02-03 | Merge with Master after Viewer release | Callum Prentice | |
2021-02-01 | Merge branch 'master' into DRTVWR-522-maint | Andrey Lihatskiy | |
2020-12-07 | SL-1777 FIXED Uploading Image or Saving Snapshot while in Inventory Recent ↵ | Mnikolenko Productengine | |
tab jumps to Main tab | |||
2020-10-06 | Add in the C++ filesystem based cache and clean up some indempotent ↵ | Callum Prentice | |
functions in llfilesystem | |||
2020-09-24 | Complete the change from lldiskcache -> llfilesystem and then addition of ↵ | Callum Prentice | |
new lldiskcache implementation | |||
2020-09-16 | Renamed 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-16 | First 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-19 | SL-13487 File extension checks should ignore case | Mnikolenko Productengine | |
2020-03-18 | Merge master (v 6.3.9) into DRTVWR-440 | Dave Houlton | |
2019-11-25 | SL-12097, SL-12098, SL-12099 UI update for Texture, Animation and Sound ↵ | Mnikolenko Productengine | |
upload fees | |||
2019-11-19 | SL-10499 - Fixes for benefits info and upload, especially bulk upload | Brad Payne (Vir Linden) | |
2019-11-18 | SL-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-15 | SL-10499 - benefits. Removed no-longer-needed lleconomy files and classes. ↵ | Brad Payne (Vir Linden) | |
Group-related costs and limits via benefits. | |||
2019-11-14 | SL-10499, SL-10497 - use LLAgentBenefits info | Brad Payne (Vir Linden) | |
2018-09-26 | Merge | Rider Linden | |
2018-08-24 | Finish dirty and close warning for fixed environment editors. | Rider Linden | |
2018-07-27 | MAINT-8924 FIXED Outfit snapshot upload closes inventory | maxim_productengine | |
2018-06-21 | Merge | Rider Linden | |
2018-05-31 | MAINT-8702 FIXED Uploading any item results in opening previous Item Profile ↵ | maxim_productengine | |
instead of Inventory Floater | |||
2018-05-22 | Merge | Rider Linden | |
2018-03-22 | MAINT-8403 Restore fail case for general upload snapshot | maxim_productengine | |
2018-03-21 | MAINT-8403 FIXED "Snapshot" is stuck and not responding after sending ↵ | maxim_productengine | |
snapshot via e-mail | |||
2018-03-07 | Merge | Rider Linden | |
2018-02-26 | Added settings inventory object with subtype | Rider Linden | |
2017-12-04 | MAINT-7993 Fixed on uploading inventory will show up but won't display ↵ | andreykproductengine | |
uploaded item | |||
2017-05-04 | MAINT-7210 Improving notification for Image upload failures | andreykproductengine | |
2017-04-27 | MAINT-7210 Increased timeout for asset uploads | andreykproductengine | |
2017-01-17 | MAINT-6959 Ability to set custom folders for uploading items | andreykproductengine | |