summaryrefslogtreecommitdiff
path: root/indra/llinventory
AgeCommit message (Collapse)Author
2021-03-02Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-02-09SL-14797 Normalize right-click menus on Landmarks & Picks Part#3Andrey Kleshchev
2021-02-08Merge branch 'SL-14532' into DRTVWR-527-maintAndrey Lihatskiy
2021-02-03Merge with Master after Viewer releaseCallum Prentice
2021-02-01Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
2021-02-01Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-01-13SL-14575 Pass validation flags into EEP validators.Andrey Kleshchev
2020-12-17SL-14570 - detailed breakdown of system folder issues in inventory ↵Brad Payne (Vir Linden)
validation. More info about expected state of system folders in llfoldertype
2020-11-13Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
# Conflicts: # indra/llui/llfolderview.cpp # indra/llui/llfolderviewmodel.cpp # indra/newview/llenvironment.cpp
2020-11-11Merge branch 'master' into DRTVWR-519Callum Prentice
2020-11-11Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llui/llfolderviewmodel.h # indra/newview/lltexturecache.cpp # indra/newview/llviewermenu.h # indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
2020-10-14SL-14119 Crash at LLVolumeFace::cacheOptimizeAndrey Kleshchev
2020-09-28Merge with tip of ReleaseCallum Prentice
2020-09-28Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llvocache.cpp
2020-09-28Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # indra/newview/pipeline.cpp
2020-09-24SL-13986 Validate uuidAndrey Kleshchev
2020-09-23SL-13986 Validate buffer size to avoid SIGBUS crash on sscanfAndrey Kleshchev
2020-09-17The folder where the disk cache lives was originally renamed from llvfs to ↵Callum Prentice
llcache but @henri's suggestion that that doesn't reflect the other files in the same place and it should be llfilesystem is a good one so I changed it over
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-08-10SL-13669 tests should cover import/export category from llsdMnikolenko Productengine
2020-08-07SL-13669 updated testsMnikolenko Productengine
2020-08-04SL-13669 Change inventory cache to use a standard LLSD formatMnikolenko Productengine
2020-07-23Merge branch 'master' v6.4.6 into DRTVWR-497Dave Houlton
2020-07-21Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml
2020-07-01SL-12978 Add note about similar code in C++ and GLSLPtolemy
2020-06-29SL-13467 Make LLTrace::BlockTimerStatHandle keys uniqueAndrey Lihatskiy
Original commit in Nat's repo: https://bitbucket.org/lindenlab/viewer-vs2017-git/commits/f627140cf11232bab11fdfaf66c78544cf44f3e8
2020-06-19DRTVWR-476, SL-13467: Make LLTrace::BlockTimerStatHandle keys unique.Nat Goodspeed
There are duplicate LLTrace::BlockTimerStatHandle key strings declared in llsettingsdaycycle.cpp and llsettingswater.cpp -- the only instances of duplicate BlockTimerStatHandle keys in the viewer code base. SL-13467 tracks intentional crashes due to duplicate LLInstanceTracker subclass instances with one of those keys. The simplest experiment to try to eliminate those crashes is to ensure that every BlockTimerStatHandle in the code base is unique.
2020-05-08SL-12963 Additional environment debug outputAndrey Kleshchev
2020-04-28SL-12298 Convert LLSettingsType to an LLSINGLETON variantMnikolenko Productengine
2020-03-27SL-12911 Add Debug setting EnvironmentPersistAcrossLoginAndrey Kleshchev
2020-03-27Removed obsolete and misleading variableAndrey Kleshchev
2020-03-18Merge master (v 6.3.9) into DRTVWR-440Dave Houlton
2020-02-24SL-12741 Moon was using fixed colorAndrey Kleshchev
2020-01-23SL-12591 Fixed float comparisonandreykproductengine
2019-12-19SL-11606 fix to match EEP light falloff vs releaseDave Houlton
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-08-27SL-11055Graham Linden
Remedy cloud_shadow and hack halving being done twice to ambient in some cases (i.e. artificial dimunition of necessary bullshit factor).
2019-08-26Merge 6.3.1 viewer-releaseGraham Linden
2019-08-26MergeRider Linden
2019-08-26SL-11705, SL-11706: New flags in llsettings base for tracking by simulator.Rider Linden
2019-08-22SL-11776Graham Linden
Fix false alarming sky updates and doing expensive CPU work for same sky pixels.
2019-08-13SL-11212Graham Linden
Remove color clamping in determining sun diffuse and moonlight diffuse color from atmo settings.
2019-07-24SL-11600Graham Linden
Make default direction when neither sun nor moon are up straight down instead of noon.
2019-07-10SL-11541 WIPGraham Linden
Make LLSettingsSky::gammaCorrect work like the soft scale clip and gamma correct from release. Add transmittance effects to the low-end sky tex gen.
2019-06-27SL-11151, SL-11504Graham Linden
Remove update threshold logic causing hiccups and rework sky updates. Make deferred water do double transport again to match non-ALM rendering more closely.
2019-06-26SL-11151Graham Linden
Modify env settings blender to not skip.
2019-06-03MergeGraham Linden