summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
AgeCommit message (Collapse)Author
2022-05-06Merged in SL-17274 (pull request #964)Michael Pohoreski
SL-17274: Stub for PBR DrawPool and shader Approved-by: Euclid Linden Approved-by: Dave Parks
2022-05-06SL-17274: Add debug rendering to pbr shaderPtolemy
2022-05-06SL-17274: Add vary_position, cleanup whitespacePtolemy
2022-05-04Merge remote-tracking branch 'origin/master' into DRTVWR-559Brad Kittenbrink
2022-05-04SL-17283 LLReflectionMapManager prototype. Remove snapshot code related ↵Dave Parks
overhead from reflection map renders. Add parallax correction and support for multiple reflection maps.
2022-05-02SL-17274: Stub for PBR DrawPool and shaderPtolemy
2022-04-29SL-17282 prototype mixing of reflection map into legacy materialsDave Parks
2022-04-18Merge branch master (D540) into DRTVWR-546Andrey Kleshchev
# Conflicts: # indra/llcommon/llsdutil.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolalpha.cpp # indra/newview/lldrawpoolwater.cpp
2022-04-18Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfaBrad Kittenbrink
2022-04-11SL-17194 Impostor quality pass 2 (and fix for fully transparent rigged ↵Dave Parks
attachments rendering to depth buffer)
2022-04-11SL-17173 Impostor quality pass.Dave Parks
2022-04-05Merge remote-tracking branch 'origin/SL-16950' into DRTVWR-540-maintAndrey Lihatskiy
2022-03-25Merged DRTVWR-546 into SL-16993Michael Pohoreski
2022-03-24SL-17028 Fix for inconsistent ordering of transparent rigged meshes and ↵Dave Parks
removal of glow-only rigged meshes from depth buffer.
2022-03-18SL-16993: Add new shaders for physics hullPtolemy
2022-03-17SL-17019 mfa_hash should get saved per-usernameBrad Kittenbrink
2022-03-09SL-16972 Per feedback from Ansariel, only bump up max heap size on 64-bit ↵Dave Parks
builds.
2022-03-08SL-16950 - handle case that an initial outfit is created in user inventory ↵Brad Payne (Vir Linden)
before first login
2022-03-07SL-16972 Fix for blurry textures when "running out" of system memory.Dave Parks
2022-03-07Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfaBrad Kittenbrink
2022-03-04SL-16928 Fix for broken bumpmaps on Intel GPUsDave Parks
2022-03-01SL-16953 Deprecated NoInventoryLibraryAndrey Kleshchev
Due to changes in SL-16715
2022-03-01Merge branch 'master' (DRTVWR-557) into DRTVWR-546Andrey Kleshchev
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/cmake/GLOD.cmake # indra/llcommon/tests/llprocess_test.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolavatar.cpp # indra/newview/llfloatermodelpreview.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp # indra/newview/viewer_manifest.py
2022-02-28Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llcommon/llsys.cpp # indra/newview/app_settings/key_bindings.xml # indra/newview/llfloatereditextdaycycle.cpp
2022-02-04Related to fix for SL-16792, standardize on naming the filed simply mfa_hash ↵Brad Kittenbrink
end-to-end to avoid confusion
2022-01-27SL-16717 Rename RenderGLCoreProfile to prevent compatibility issuesAndrey Kleshchev
2022-01-14SL-16514 store mfa hash in protected data using LLSecAPIBasicHandlerBrad Kittenbrink
2022-01-14SL-11841 Correct settingAndrey Lihatskiy
2022-01-11Revert "SL-11841 make ‘Push to talk’ the default setting"Andrey Lihatskiy
+ post merge conflict fix
2022-01-10Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JKAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/key_bindings.xml # indra/newview/llappviewer.cpp # indra/newview/llkeyconflict.cpp
2021-12-26Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
2021-12-17Merge branch 'DRTVWR-546' of ssh://bitbucket.org/lindenlab/viewer into ↵Runitai Linden
DRTVWR-546
2021-12-17SL-16478 Fix for octree and render batch debug display not working with ↵Runitai Linden
rigged meshes.
2021-12-15Merge remote-tracking branch 'origin/master' into brad/DRTVWR-550-mfaBrad Kittenbrink
2021-12-15Merge updated branch 'DRTVWR-546' into DV546-merge-6.5.2Dave Houlton
2021-12-15SL-16489 Fix for rigged attachment glow showing up near origin.Runitai Linden
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
2021-12-15Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-12-15Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maintAndrey Kleshchev
# Conflicts: # indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback # indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
2021-12-13SL-16501 SLMFAHash is now saved client sideBrad Kittenbrink
2021-12-08SL-16468 Fix for crash when enabling highlight transparent (add rigged mesh ↵Runitai Linden
support to highlight transparent).
2021-12-06SL-16202 Put Multi-threaded GL behind a feature flag and update featuretable ↵Dave Parks
(decruftify settings, compatibility pass).
2021-12-03SL-16436 and SL-16327 Fix for RenderDebugGL test failures and fix for grey ↵Dave Parks
textures
2021-11-30SL-16369 Remove Hardware Skinning settingMnikolenko Productengine
2021-11-24DRTVWR-546, SL-16220, SL-16094: Undo previous glthread branch revert.Nat Goodspeed
Reverting a merge is sticky: it tells git you never want to see that branch again. Merging the DRTVWR-546 branch, which contained the revert, into the glthread branch undid much of the development work on that branch. To restore it we must revert the revert. This reverts commit 029b41c0419e975bbb28454538b46dc69ce5d2ba.
2021-11-20SL-16289 Rigged mesh rendering overhaulDave Parks
2021-11-19Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llfloatereditextdaycycle.cpp # indra/newview/llviewerinput.cpp
2021-11-16DRTVWR-546 merge in master v6.5.1Dave Houlton
2021-11-16Merge branch 'DRTVWR-519' into DRTVWR-552-cache-360Andrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml
2021-11-16Merge branch 'master' into DRTVWR-534Andrey Lihatskiy
# Conflicts: # indra/newview/VIEWER_VERSION.txt
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 13:24:37 +0000