1f75fbd3b5
Merge branch 'main' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llimage/llimagebmp.cpp
# indra/llimage/llimagetga.cpp
# indra/llrender/llrender.cpp
# indra/llui/lltransutil.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llviewerwindow.cpp
2024-03-26 22:43:42 +01:00
c111665779
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-03-26 22:29:40 +01:00
eb9872aa0f
Get rid of static method declarations in header since they are only used in the cpp translation unit
2024-03-10 16:25:20 +01:00
1c6cabb424
Don't mark the definitions as static
2024-03-10 14:59:28 +00:00
6b3339609e
support user selected b&w/colour in fallback rendering.+ emoji button
...
Allow emoji in button text on emoji picker (visually shows the mono/colour mode)
debug setting allows user to pic a custom label cos why not.
2024-03-10 02:57:50 +00:00
425da225a6
Add support for B&W emoji rendering.
...
Requires updated 3p-viewer-fonts package.
2024-03-09 02:48:06 +00:00
6c43baf029
Issue #54 LLRender::init crash
2024-03-05 01:58:57 +02:00
78ce375dda
SL-17896 Don't crash silently if files are missing or out of memory
...
Under debug LL_ERRS will show a message as well, but release won't show
anything and will quit silently so show a notification when applicable.
2024-03-05 00:29:35 +02:00
2827ebf04f
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-03-01 22:47:21 +01:00
258c039584
Merge remote-tracking branch 'origin/main' into release/gltf-maint2
2024-03-01 10:12:00 -08:00
394c8e17d5
Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llrender/llfontfreetype.cpp
# indra/llui/llfloater.cpp
# indra/llui/llfloater.h
# indra/llui/lltextbase.cpp
# indra/newview/llfloateremojipicker.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llinventorygallery.cpp
# indra/newview/llworldmapview.cpp
# indra/newview/skins/default/xui/en/floater_emoji_picker.xml
2024-01-26 00:32:06 +01:00
c7a44ac88b
Merge branch 'DRTVWR-601' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/lltexturectrl.h
2024-01-17 11:04:36 +01:00
ae91ae43a5
SL-20795 Part of previously typed emojis disappear in the 'Save settings as a preset...' option of the 'Preferences' floater
2024-01-17 04:34:21 +01:00
fab4cfbab2
SL-20704 Fix for pathfinding debug display not working.
2024-01-10 13:50:15 -06:00
709aaaf0b0
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
...
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
2024-01-09 11:58:47 +01:00
7d4de08fa9
Merge branch 'main' into DRTVWR-489
...
# Conflicts:
# indra/newview/llmaterialeditor.cpp
2024-01-08 23:49:38 +02:00
b32cd27b4c
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# autobuild.xml
# indra/cmake/ViewerMiscLibs.cmake
# indra/llmath/llvolume.cpp
# indra/newview/fonts/DejaVu-license.txt
# indra/newview/fonts/DejaVuSans-Bold.ttf
# indra/newview/fonts/DejaVuSans-BoldOblique.ttf
# indra/newview/fonts/DejaVuSans-Oblique.ttf
# indra/newview/fonts/DejaVuSans.ttf
# indra/newview/fonts/DejaVuSansMono.ttf
# indra/newview/llviewermenu.cpp
2023-12-18 19:25:49 +01:00
793bed7d06
Merge branch 'main' into DRTVWR-489
...
# Conflicts:
# indra/newview/fonts/DejaVu-license.txt
# indra/newview/fonts/DejaVuSans-Bold.ttf
# indra/newview/fonts/DejaVuSans-BoldOblique.ttf
# indra/newview/fonts/DejaVuSans-Oblique.ttf
# indra/newview/fonts/DejaVuSans.ttf
# indra/newview/fonts/DejaVuSansMono.ttf
2023-12-15 07:06:15 +02:00
a666e640c8
Merge branch 'DRTVWR-596' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/skins/default/xui/en/notifications.xml
2023-12-08 00:10:01 +01:00
c9cd5631e4
Merge branch 'main' into DRTVWR-489
2023-12-05 03:37:06 +01:00
4275b1ade8
Merge branch 'DRTVWR-596' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llprimitive/lldaeloader.cpp
# indra/llprimitive/llmodel.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llviewermenufile.cpp
# indra/newview/skins/default/xui/en/floater_snapshot.xml
2023-12-03 14:56:30 +01:00
7c7b94a044
Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llspatialpartition.cpp
# indra/newview/llvoavatar.cpp
2023-12-01 11:30:40 +01:00
a09b083b1b
Merge branch 'DRTVWR-596' into davep/SL-20611
2023-11-30 12:19:38 -06:00
95abeff523
Work in progress for shader updates (not working)
2023-11-25 14:43:09 +00:00
7706c1771d
SL-20411 Thumbnail textures should have less of an impact on performance #1
...
scale thumbnail textures down to 256 when needed. As we do to chat icons.
# Conflicts:
# indra/newview/llviewertexture.cpp
2023-11-21 22:11:30 +02:00
964f9e74d5
SL-20611 followup -- remove now unused glsl files. Fix transparent water.
2023-11-17 10:10:58 -06:00
bdb53fd56d
SL-20611 Make haze effect local lights -- move sky and water haze to their own passes and unify sky and water haze in forward rendering shaders.
2023-11-16 16:46:12 -06:00
b4bc1b3286
Linux: Experimentally apply Alchemy's AMD/intel GPU memory detection fix - Thanks to Rye for this code
2023-11-02 05:53:30 +01:00
6c389316f1
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
# indra/llrender/llrender.h
# indra/newview/VIEWER_VERSION.txt
2023-10-27 13:00:41 +02:00
26163e2154
Fix DRTVWR-559 std::array usage in llrender and llprimitive after merge
2023-10-25 16:44:14 -07:00
a29f7c3b4a
SL-20498 Preserve default probe when resetting reflection probes.
2023-10-23 13:54:00 -05:00
e7f1466a7b
Merge branch main into DRTVWR-489
2023-10-08 14:01:05 +02:00
49bbb565b6
Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llpanelemojicomplete.cpp
# indra/newview/skins/default/xui/en/widgets/emoji_complete.xml
2023-10-04 16:56:32 +02:00
478cbd595b
Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llpanelemojicomplete.cpp
# indra/newview/skins/default/xui/en/widgets/emoji_complete.xml
2023-10-04 16:17:22 +02:00
0a928bf1fd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llagent.cpp
# indra/newview/llfloaternewfeaturenotification.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llsidepaneltaskinfo.cpp
# indra/newview/llsidepaneltaskinfo.h
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/llviewerinventory.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewertexturelist.h
# indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
2023-10-04 11:38:21 +02:00
7d50a51434
Merge branch 'main' (DRTVWR-567) into DRTVWR-559
...
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llagent.cpp
# indra/newview/llfloaternewfeaturenotification.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llsidepaneltaskinfo.cpp
# indra/newview/llsidepaneltaskinfo.h
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/llviewerinventory.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewertexturelist.h
# indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
# indra/newview/skins/default/xui/en/menu_inventory.xml
2023-10-03 19:00:33 +03:00
be655fef7f
:x
2023-10-03 14:23:38 +02:00
c12c377c61
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
2023-10-01 18:18:17 +02:00
a4c2eab969
Fix integer overflow when framebuffers are extremely high resolution resulting in INT_MAX texture bias ( #393 )
2023-09-28 15:05:37 -05:00
0514918bed
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# scripts/messages/message_template.msg.sha1
2023-09-21 18:34:10 +02:00
74940194fa
Merge remote-tracking branch 'remotes/origin/DRTVWR-559' into davep/SL-19842
2023-09-11 11:51:20 -05:00
9c338b3167
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llpanelface.cpp
2023-09-07 15:47:51 +02:00
8d0af77d0b
SL-19709 Fix for fullbright shiny not factoring out exposure (update)
2023-09-05 16:59:48 +02:00
5ef0318270
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-08-31 18:35:52 +02:00
f075bf7599
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# .github/workflows/build_viewer.yml
# indra/newview/llface.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewerregion.cpp
2023-08-31 18:09:40 +02:00
37d04235fe
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-08-30 14:38:51 +02:00
da87047e64
llrender must be compiled with -fPIC.
...
None of the other code (except for the SHARED libraries, but they
are already anyway) need to be compiled with -fPIC. That flags
can therefore now be removed from fs-build-variables.
2023-08-28 13:02:23 +02:00
fc5a86a6cc
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventoryobserver.cpp
# indra/newview/llinventoryobserver.h
2023-08-25 01:19:32 +02:00
3d73a10da3
Merge branch main (DRTVWR-582) into DRTVWR-567
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventoryobserver.cpp
# indra/newview/llinventoryobserver.h
# indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
2023-08-23 22:40:17 +03:00
894c9e0417
SL-19842 WIP -- Move sky auto adjustment magic numbers to debug settings.
2023-08-22 13:17:58 -05:00
Ansariel