Commit Graph

75043 Commits (22e0c08ec578657c3c98d2eaf62ea0b0d9f6dd75)

Author SHA1 Message Date
Ansariel 22e0c08ec5 Fix OpenSim build 2024-06-21 21:21:16 +02:00
Ansariel de6055abdd Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	indra/llrender/llgl.h
#	indra/newview/llappviewer.cpp
2024-06-21 20:42:55 +02:00
Ansariel 31b70d0abb Merge branch 'release/maint-a' of https://github.com/secondlife/viewer 2024-06-21 20:41:38 +02:00
Ansariel 98d5f7185a Fix settings can't be restored properly 2024-06-21 16:02:45 +02:00
Zi Ree ef09c6bf08 FIRE-33958 - catch at least one mode where notifications can become stuck in the notifications list - more analysis needed as to why this is becoming an issue at all after all this time 2024-06-20 16:26:35 +02:00
PanteraPolnocy 2dba8ec137 FIRE-34072 Italian Translation Update, by Spartaco Zemenis
menu_viewer.xml -> English strings -> On purpose (discussed)
2024-06-20 00:11:02 +02:00
Zi Ree b7a40f5339 FIRE-34067 - fix text clipping on texture transforms panels 2024-06-19 23:56:30 +02:00
Ansariel 146fbd6a7f Update German translation 2024-06-19 23:45:44 +02:00
PanteraPolnocy cdc688c7ed Translations; Fine tuning for that checkbox 2024-06-19 23:36:39 +02:00
PanteraPolnocy dd758f228f Translate the new checkbox into all applicable langauges 2024-06-19 23:27:34 +02:00
PanteraPolnocy c2fb51b1b2 Correct the control name for selecting probes 2024-06-19 23:09:36 +02:00
Zi Ree db42f43d81 Add checkbox to select reflection probes to edit floater 2024-06-19 22:36:53 +02:00
Beq a70914ae5d Merge branch 'master' of ssh://github.com/FirestormViewer/phoenix-firestorm 2024-06-19 16:53:10 +01:00
Andrey Kleshchev 5ac4d55bb9 viewer#730 Zoom slider not working in some cases. 2024-06-19 15:49:39 +02:00
Beq f8d4a2817e FIRE-34064 - Bounding Box preset does not propogate. 2024-06-19 09:55:55 +01:00
Beq 610a0337ed Add dullahan to the whitelist for linux and win
if I can find mac I'll add it later.
2024-06-19 02:00:14 +01:00
Beq b5a1897c9f cherry pick of "#1771 Fix for objects disappearing and not reappearing until LoD switch" 2024-06-19 01:28:55 +01:00
PanteraPolnocy da22d179aa Provide placeholders for all applicable languages 2024-06-19 00:06:25 +02:00
PanteraPolnocy bc7b7cb988 FIRE-34063 Russian (by Romka Swallowtail) and Polish translation updates 2024-06-19 00:05:42 +02:00
Ansariel 7342ebf43a Follow-up improvements of 810219d3bf 2024-06-18 21:41:00 +03:00
Andrey Kleshchev 810219d3bf jira-archive-internal#67837 Fix LLDir::getScrubbedFileName 2024-06-18 21:00:08 +03:00
Zi Ree 1d5976fdeb Fix mouselook zoom 2024-06-18 15:45:13 +02:00
Ansariel 64cb25cb5f Include all VRAM settings in system information 2024-06-18 11:13:52 +02:00
Ansariel 8030bba730 Update German translation 2024-06-18 09:50:03 +02:00
Beq 174b934a13 Revised VRAM override for cross-platform
relocated for x-platform (tested on Win and Linux, Mac TBC)
2024-06-18 01:12:32 +01:00
Ansariel fa20e5ce3b Merge branch 'release/maint-a' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llwindow/llwindow.cpp
#	indra/llwindow/llwindow.h
#	indra/llwindow/llwindowmacosx.cpp
#	indra/llwindow/llwindowmacosx.h
#	indra/llwindow/llwindowwin32.cpp
#	indra/llwindow/llwindowwin32.h
#	indra/newview/llviewerwindow.cpp
2024-06-17 19:14:45 +02:00
Ansariel ea83746cda Remove orphaned VRAM handling code 2024-06-17 19:04:41 +03:00
Ansariel ca96d51c66 Add missing RenderLocalLightCount debug setting to graphics preferences which was exposed by LL recently 2024-06-17 12:20:38 +02:00
Beq c882518f26 Try to get a little more knowledge about the stuck notifications. 2024-06-16 23:26:41 +01:00
Zi Ree a7c260f7a9 Housekeeping: learn how to correctly spell applying as well 2024-06-16 21:17:48 +02:00
Ansariel d4ecdfa917 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	indra/newview/fspanelface.cpp
#	indra/newview/fspanelface.h
#	indra/newview/llfloaterland.cpp
#	indra/newview/llviewercamera.h
#	indra/newview/llviewerwindow.cpp
#	indra/newview/vjlocalmesh.cpp
2024-06-16 20:56:54 +02:00
Ansariel 1af791f96c Merge branch 'release/maint-a' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llviewerregion.cpp
2024-06-16 20:50:59 +02:00
Beq 9c4df3d952 Fix cherrypicking oops 2024-06-16 19:28:09 +01:00
Zi Ree 56a7bb28da Housekeeping: learn how to spell apply 2024-06-16 19:56:07 +02:00
Zi Ree 515c06113d Fix another case of BP channel mixup when using drag and drop 2024-06-16 19:52:44 +02:00
Beq d8f4980d41 viewer#1672 Crash at setDefaultFOV
Cherry pick from Main-A
Some things can make a copy of camera, like LLViewerWindow::cubeSnapshot
so need to store and clean up the connection
2024-06-16 18:01:40 +01:00
Beq f5a6ff4880 optimise heroprobe activation a bit more. 2024-06-16 17:57:09 +01:00
Beq c6ab9b5a8e spotted when exploring a bugsplat
Not convinced this will stop the splat but it seems like a safer option.
2024-06-16 01:43:50 +01:00
Beq 362be6b939 LL Issues 1719/1721Interim fix for mirrors not turning off.
two issues relating to the same problem.
both essentially housekeeping issues when probes are disabled or go out of view.
2024-06-15 23:22:42 +01:00
Beq 214af7a1ec Changing deferred retry behaviour 2024-06-15 16:30:24 +01:00
Zi Ree e9a45d709c A bit of cleanup, whitespace and debugging log 2024-06-15 00:51:10 +02:00
PanteraPolnocy ef80de88e8 FIRE-34041 Add missing combo box in Russian translation, by Romka Swallowtail 2024-06-14 23:30:31 +02:00
Beq 40e539ab8b save the edit then commit.... 2024-06-14 18:54:08 +01:00
Beq baa0ec7807 more unused but set 2024-06-14 18:50:43 +01:00
PanteraPolnocy b0cc304f39 FIRE-34032, FIRE-34031: Updated French (by Laurent Bechir), Russian (by Romka Swallowtail) and Polish translations 2024-06-14 19:10:07 +02:00
Zi Ree cc4c414873 FIRE-33856 - fix cancel button for BP diffuse textures 2024-06-14 17:59:05 +02:00
Beq c03f0fe416 remove some unused variables that upset clang and modernise a loop or two 2024-06-14 16:54:26 +01:00
Zi Ree 2d0c807daf Fix BP texture picker applying texture to the wrong material channel when different transforms tab is open 2024-06-14 17:26:28 +02:00
Zi Ree c27cf95b91 Pass pointers to the actual texture controls instead of their names, remove unused parameters 2024-06-14 17:15:59 +02:00
Ansariel 0a538a7513 Update German translation 2024-06-14 10:32:24 +02:00