summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
AgeCommit message (Collapse)Author
2023-03-08SL-19359 Show Received Items panel in all new Inventory floatersMnikolenko Productengine
2023-02-27SL-19274 Add new double-click option to Inventory settingsMaxim Nikolenko
2023-02-24SL-19234 add Inventory settings floaterMaxim Nikolenko
2022-12-12Merge branch 'main' into DRTVWR-570-maint-QAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloater360capture.cpp
2022-11-14SL-18637 Reverted material shader changesAndrey Lihatskiy
original fix by Beq Janus
2022-11-09Merge remote-tracking branch ↵Andrey Lihatskiy
'BeqJanus/ll-viewer-pull-requests/Beq-alpha-mask-on-emissive-fix' into DRTVWR-570-maint-Q
2022-11-05[BUG-232834][BUG-232871] Alpha mask is being applied with emissive maskBeq
This is the most local fix for this issue, addressing the specific unqualified use of HAS_ALPHA_MASK. If we find other issues with alpha mask being applied incorrectly then, it may be better to fix higher up in llvieweshadermgr.cpp by reverting the changes from SL-17532. For now, this way works for this specific bug without non-emissive side-effects.
2022-10-24SL-18388 Searchable debug settings UIMnikolenko Productengine
2022-10-20Merge branch 'master' into DRTVWR-570-maint-QAndrey Lihatskiy
# Conflicts: # indra/newview/llnetmap.cpp # indra/newview/llnetmap.h
2022-10-20Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-10-05SL-18228 The search page works like a web search instead of in-viewer oneAndrey Kleshchev
2022-10-01SL-14696 SL-13629 Re-add gradation fix after merging a contributionAndrey Kleshchev
2022-09-30Port required changes to render rainbows and sun dogs to class1 deferred sky ↵Rye Mutt
shader and remove redundant and slow class2 version. # Conflicts: # indra/newview/app_settings/shaders/class2/deferred/skyF.glsl
2022-09-15Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # indra/newview/llmodelpreview.h
2022-09-15Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-08-31Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
# Conflicts: # indra/newview/llfloateroutfitsnapshot.cpp
2022-08-31Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
2022-08-31Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelpicks.cpp # indra/newview/llpanelprofile.cpp
2022-07-27SL-17809 Sounds from Avatar position instead of Camera positionMnikolenko Productengine
2022-06-29Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llviewercontrol.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-06-22SL-17329: Increase percent of CacheSize allocated to the disk cache from 20% ↵Cosmic Linden
to 40%
2022-06-06SL-17532 Potential fix for some rigged mesh draw order issues.Dave Parks
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-27Merged in SL-15937 (pull request #991)Howard Stearns
SL-15937 - adjust memory limit / cache code Approved-by: Andrey Lihatskiy Approved-by: Vir Linden
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-548-maint-NAndrey Lihatskiy
2022-05-26Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/newview/llviewertexturelist.cpp
2022-05-23SL-15937 - adjust memory limit / cache codeHoward Stearns
2022-05-23SL-17339 Controls > Restore Defaults should clear the "Walk to" action.Mnikolenko Productengine
2022-05-20SL-17463: Set the default for MiniMapRotate back to true (enable minimap ↵Cosmic Linden
rotation by default), but set MiniMapRotate to false for new installs
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-05SL-16916: Fix incorrect defaults for minimap rotation and minimap scaleCosmic Linden
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-05-04Merge branch 'master' into DRTVWR-548-maint-NAndrey 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-548-maint-NAndrey 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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-11 05:15:55 +0000