cbf6aca2e8
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# .github/workflows/build.yaml
2024-03-27 10:35:43 +01:00
c111665779
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-03-26 22:29:40 +01:00
1003259112
Use colorful emojis as default
2024-03-10 16:16:58 +01: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
6361932c21
Invert setting
2024-03-04 16:02:49 +01:00
5a0b671cc1
FIRE-33735: Option to suppress emoji chooser window from automatically popping up while typing in chat bars
2024-03-04 00:14:21 +01:00
2827ebf04f
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-03-01 22:47:21 +01:00
203ac04bf6
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/skins/default/xui/en/floater_stats.xml
2024-03-01 20:49:42 +01:00
474cbf62cf
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-02-14 18:04:46 +01:00
fbca5e5005
FIRE-33659 - [PBR] Remove the "Reflections" toggle as it no longer does the right thing.
2024-02-13 15:58:40 +00:00
bc6a69ac66
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-02-11 18:37:21 +01:00
bce7069a32
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-02-08 15:01:40 +01:00
11207d7985
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
2024-01-26 13:19:06 +01:00
23edfd0bfa
Merge branch 'release/gltf-maint2' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
2024-01-25 20:39:44 +01:00
869712e273
SL-20669 Move constants out of settings.xml
...
UIImgInvisibleUUID doesn't exist
Default normal for material is 'null'
2024-01-24 17:40:01 +02:00
66f6528f2f
Remove orphaned setting
2024-01-23 16:14:15 +01:00
fa05f94eae
Merge branch 'release/gltf-maint2' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/app_settings/settings.xml
2024-01-23 12:23:54 +01:00
586e4cd090
SL-18429 Make it so auto adjusting legacy skies merely turns on tonemapping.
2024-01-17 12:14:44 -06: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
2c8532bdc7
SL-20629 Fix Probe ambiance being displayed as 0 when it isn't
...
And hide warning when it's already 0
2024-01-12 20:08:17 +02: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
3bd76c0fea
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
...
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llfasttimerview.cpp
# indra/newview/skins/default/xui/en/widgets/color_swatch.xml
# indra/newview/skins/default/xui/en/widgets/texture_picker.xml
2024-01-09 09:37:38 +01: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
8f27305e5d
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
2023-12-15 23:35:39 +01:00
783e488a63
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# indra/newview/llfloaterimcontainer.cpp
# indra/newview/llspatialpartition.cpp
2023-12-15 22:48:56 +01:00
e3c2f12d53
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# indra/newview/skins/default/xui/da/panel_main_inventory.xml
# indra/newview/skins/default/xui/pt/panel_main_inventory.xml
# indra/newview/skins/default/xui/tr/panel_main_inventory.xml
# indra/newview/skins/default/xui/zh/panel_main_inventory.xml
2023-12-15 18:25:32 +01:00
881eb4fd02
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-12-15 18:23:24 +01:00
3b3a00e5db
Disable mic toggle sound by default, as it seems to conflict with "true push to talk"" in some scenarios
2023-12-14 17:06:57 +01:00
6be5fc07a0
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
2023-12-12 12:21:31 +01:00
48c1225f9b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-12-12 12:20:02 +01:00
d63bd14d81
FIRE-33249 Blip sound for when mic (voice) toggles on/off
2023-12-10 18:41:06 +01:00
a2abdb159b
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
2023-12-08 00:06:36 +01:00
83f2a7b9ce
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/llaisapi.cpp
2023-12-08 00:05:11 +01:00
1390119247
FIRE-33356 / FIRE-33285: Add option to disable thumbnail tooltips and control the delay
2023-12-07 21:51:23 +01:00
1cb6cca8c9
Twitter floater doesn't exist anymore
2023-12-04 17:29: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
63fe3b4c52
FIRE-32267 - Allow Reliable LOD generation to be set as default
...
A new setting has been added to the mesh uploader settings tab allowing the user to toggle their preference for GLOD as default behaviour. default remains as per LL.
2023-12-03 01:55:34 +00:00
35de2e2a2f
Use more cores for image decoding and reserve 4 for other important things (main thread, renderg, mesh repo, LFS); bring back FSImageDecodeThreads debug setting
2023-12-02 17:59:26 +01:00
d26000bac7
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llui/llflatlistview.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawpoolground.cpp
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/xui/de/notifications.xml
# indra/newview/skins/default/xui/en/floater_stats.xml
# indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
2023-12-01 12:39:13 +01:00
50c7296d34
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/newview/llspatialpartition.cpp
# indra/newview/llvoavatar.cpp
2023-12-01 11:27:42 +01:00
70eda83fb0
SL-20563 Add 'No Post' option to Snapshot floater
2023-11-21 12:41:40 +01:00
e3286bc4e6
Sync this setting with upstream - just to be safe
2023-11-20 13:03:38 +01:00
ca300cc46f
SL-20567 Default HiDPI off (mac performance improvement)
2023-11-03 10:54:01 -05:00
70db255e02
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# .github/workflows/build.yaml
# autobuild.xml
# indra/llcommon/llerror.cpp
# indra/llcommon/tests/workqueue_test.cpp
# indra/newview/VIEWER_VERSION.txt
2023-10-27 11:52:59 +02:00
f6134cdd00
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# autobuild.xml
2023-10-27 11:33:06 +02:00
4a8fd7423d
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# autobuild.xml
# indra/llcommon/tests/llleap_test.cpp
2023-10-26 21:16:03 +02:00
e2e77b4f20
Replace ReportBugURL
2023-10-25 10:00:07 +02:00
2053458181
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llinventorybridge.cpp
# indra/newview/pipeline.h
# indra/newview/skins/default/xui/en/menu_inventory.xml
2023-10-18 14:55:45 +02:00
f5294527f5
Update settings.xml
...
SL-20154
2023-10-17 15:59:14 -07:00
Ansariel