513ac361b1
Got things to compile again after DRTVWR-559 & DRTVWR-539 merge.
...
removing dead code and references to members that don't exist anymore
2023-04-26 17:34:43 -07:00
369945b45d
Merge remote-tracking branch 'origin/DRTVWR-539' into DRTVWR-559-merge-539
2023-04-26 15:38:47 -07:00
e1661fdcda
SL-19160 Enable ALM ctrl when Atmospheric shaders are used
2023-02-08 01:39:56 +02:00
1c2410b8af
SL-19148 Decruft followthrough -- decruft shader tree and some remaining forward rendering code.
2023-02-03 19:45:31 -06:00
c43336d5ed
SL-18930 Update Autotune panel
2023-01-27 01:33:11 +02:00
6c418060c1
SL-18979 FIXED "Reset to recommended settings" should reset Maximum render time of Avatars nearby
2023-01-16 19:12:42 +02:00
020bfa66ba
SL-18923 Add Reset to default settings button
2023-01-10 22:55:47 +02:00
553a98723b
Merge branch 'main' into DRTVWR-539
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llappviewer.cpp
# indra/newview/skins/default/colors.xml
2022-12-13 08:05:03 +02:00
eb526fec0a
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2022-12-12 17:59:34 -08:00
c489481ec5
SL-18785 Fix for corrupt reflection probes on various preference changes. Add UI for Screen Space Reflections.
2022-12-06 09:59:30 -06:00
e46323b0b9
SL-18682 WIP -- Clear BOOST_SELECTED as needed. GL 3.2 compatibility pass. Fix for stack underflow when reflection probes disabled.
2022-11-29 10:50:25 -06:00
24fb2f8336
Merge branch 'master' (DRTVWR-548) into DRTVWR-559
...
# 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-21 18:19:27 +03:00
717b34f53f
Merge branch 'master' into DRTVWR-539
...
# Conflicts:
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
2022-10-21 14:42:53 +03:00
97b676b60f
Merge branch 'master' into DRTVWR-565-maint-P
2022-10-20 21:43:54 +03:00
42ec639c86
SL-18190 Remove water reflection detail combo box and reimplement "Transparent Water" checkbox.
2022-10-12 14:46:51 -05:00
dcd74c98dc
SL-18202 impostor too slow avatars and add autotune settings button to Preference
2022-09-27 19:35:49 +03:00
3098d315a3
SL-18202 remove old autofps
2022-09-23 16:49:47 +03:00
b66f2e7da7
SL-18202 WIP merging autotune contribution and updating UI
2022-09-21 21:19:17 +03:00
85504f085e
Merge branch 'master' into DRTVWR-539
2022-09-21 18:36:49 +03:00
09f3d6eaee
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-09-16 16:25:38 -05:00
8dc59e5ef3
SL-18128 Clear out much OpenGL cruft and switch to core profile on AMD
2022-09-16 16:25:26 -05:00
7649114588
Merge branch master (DRTVWR-571) into DRTVWR-559
...
# Conflicts:
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
2022-09-16 21:07:39 +03:00
329268c5f7
Merge branch 'master' into DRTVWR-548-maint-N
...
# Conflicts:
# indra/newview/llmodelpreview.h
2022-09-15 20:44:04 +03:00
b5861e58cb
Merge branch 'master' into DRTVWR-565-maint-P
2022-09-15 20:43:02 +03:00
5d918f98ea
SL-18161 Add PBR materials to Uploads in preferences
2022-09-15 00:29:54 +03:00
55da4ea8bb
Merge branch 'master' into DRTVWR-565-maint-P
...
# Conflicts:
# indra/newview/llfloateroutfitsnapshot.cpp
2022-08-31 00:36:22 +03:00
d19d827121
Merge branch master (DRTVWR-483) into DRTVWR-559
...
# Conflicts:
# indra/newview/lllocalbitmaps.cpp
# indra/newview/lllocalbitmaps.h
# indra/newview/llviewerregion.cpp
# lllocalgltfmaterials.* were modified to match lllocalbitmaps*
2022-08-31 00:30:49 +03:00
a9a63db0f0
Merge branch 'master' into DRTVWR-548-maint-N
2022-08-31 00:17:37 +03:00
5c18921e9a
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/newview/llpanelpicks.cpp
# indra/newview/llpanelprofile.cpp
2022-08-31 00:16:09 +03:00
197ac7cc20
Merge remote-tracking branch 'remotes/origin/DRTVWR-563' into DRTVWR-559
2022-08-30 10:46:36 -05:00
963566821d
SL-17927 Keep people from shooting themselves in the foot by twiddling deprecated settings.
2022-08-08 14:55:15 -05:00
92b09e3a16
SL-17706 Deprecate RenderGamma and RenderFogRatio and remove dead UI from graphics preferences.
2022-08-03 10:41:08 -05:00
53bd8819f7
SL-17706 Deprecate avatar cloth and remove dead UI from graphics preferences.
2022-08-03 10:08:52 -05:00
3f3735c1f8
SL-17851 Highlight matching notifications when using Search Box in Preference
2022-08-02 14:59:04 +03:00
d7b4a15a12
SL-17569 restore previous list of ignored notifications after pressing the Cancel button
2022-07-20 19:46:57 +03:00
ed36165f29
SL-17584 Frame buffer object is now nessesary to run viewer
2022-06-15 18:03:11 +03:00
9b0569840f
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/llprimitive/llmodel.cpp
# indra/llprimitive/llmodel.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
2022-05-31 01:58:09 +03:00
2ed401882e
Merge branch 'master' into DRTVWR-483
...
# Conflicts:
# indra/newview/llviewertexturelist.cpp
2022-05-26 02:56:29 +03:00
0940e88718
SL-17472 Add checkbox to preferences for enabling "PBR" that uses "class3" deferred shaders. Move reflection probe shaders to class3 and restore class2 shaders to non-reflection probe versions.
2022-05-24 10:34:47 -05:00
c0aa1a1202
SL-17219: Merge 'DRTVWR-546' of lindenlab/viewer into SL-17219
...
Update task branch from main project branch.
2022-05-18 14:08:24 -04:00
39ab2fb3fe
SL-16937 Replace sendAvatarPropertiesUpdate with profile cap in preferences
...
To avoid data loss, old api trims profile descriptions
2022-05-08 13:31:50 +03:00
29de643ffd
SL-15383 Controls table was empty after canceling advanced graphical settings
...
Also causes crashes on SearchableControl::setHighlighted due to views not being there
2022-04-26 22:02:00 +03:00
79c9a8a4b7
Merge branch 'DRTVWR-546' into DRTVWR-539
2022-04-26 16:03:03 +03:00
ce4c694b66
Merge branch master (D540) into DRTVWR-546
...
# Conflicts:
# indra/llcommon/llsdutil.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolwater.cpp
2022-04-18 23:42:39 +03:00
ea0c810d2d
SL-15312 Small tweaks for profiles
2022-04-18 23:39:21 +03:00
b6841d75c2
SL-17219 WIP - Texture pipeline overhaul
2022-04-15 19:02:07 -05:00
0aaf5284dc
Merge branch 'master' into DRTVWR-539
...
# 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-03-02 00:46:10 +02:00
97a103255e
Merge branch 'master' (DRTVWR-557) into DRTVWR-546
...
# 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-03-01 13:41:42 +02:00
73eec89131
Merge branch 'master' into DRTVWR-540-maint
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llfloatereditextdaycycle.cpp
2022-02-28 21:54:21 +02:00
b50de18162
SL-16627 add auto-adjustment warning for affected settings
2022-01-25 19:43:32 +02:00
Brad Linden