summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
AgeCommit message (Collapse)Author
2022-08-31Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelpicks.cpp # indra/newview/llpanelprofile.cpp
2022-06-29Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
2022-06-29Merge branch 'master' (DRTVWR-543) into DRTVWR-483Andrey Kleshchev
# Conflicts: # indra/newview/llviewertexturelist.cpp
2022-05-31Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/llprimitive/llmodel.cpp # indra/llprimitive/llmodel.h # indra/newview/llappviewer.cpp # indra/newview/llappviewer.h
2022-05-27Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/cmake/LLCommon.cmake # indra/llcommon/CMakeLists.txt # indra/llrender/llgl.cpp # indra/newview/llappviewer.cpp # indra/newview/llface.cpp # indra/newview/llflexibleobject.cpp # indra/newview/llvovolume.cpp
2022-05-26Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/newview/llviewertexturelist.cpp
2022-05-19SL-17451 Fix for erroneous attempt to apply vertex color alpha to texture ↵Dave Parks
before alpha masking (we don't actually support this and the vertex color alpha is sometimes zero when you think it ought not be).
2022-05-17SL-17421 Fix for fullbright alpha mask shader ignoring vertex alphaDave Parks
2022-05-16SL-17417 Fix for incorrect reflection orientation on some moving child prims.Dave Parks
2022-05-04Merge branch master (D550) into DRTVWR-546Andrey Kleshchev
# Conflicts: # indra/newview/llappviewer.h
2022-05-04Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/viewer_components/login/lllogin.cpp
2022-05-04Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2022-05-04Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2022-04-26SL-17086 Fix for bad lighting in upload preview render.Dave Parks
2022-04-20SL-15507 Post-merge fixAndrey Lihatskiy
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-18Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llfloatersearch.cpp # indra/newview/llgroupactions.cpp # indra/newview/llvovolume.cpp
2022-04-18Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2022-04-18Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2022-04-14SL-17035 Crash at gl_debug_callbackAndrey Kleshchev
RenderDebugGL was avaliable from develop menu, but since it was persistent, caused slowdowns and crashes it could result in users crashing or lagging without knowing the cause. To resolve the issue it was made to last for a single session.
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-28SL-17039 "Remember Password" checkbox state should be saved per account nameMnikolenko Productengine
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-483Andrey Lihatskiy
# Conflicts: # indra/newview/llviewermenu.cpp
2022-02-28Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/llaudio/llstreamingaudio_fmodstudio.cpp # indra/newview/llviewerregion.cpp
2022-02-28Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
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-24SL-16924 Fix viewer not opening events from staging gridAndrey Kleshchev
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-11SL-13867 Explicitly add AllowSelectAvatar to settingsAndrey Kleshchev
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
2022-01-10SL-15083 Add 'DiskCacheVersion' to keep 'filesystem cache' in checkMnikolenko Productengine
2021-12-26Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-22 11:45:12 +0000