0573e31002
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llreflectionmapmanager.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/pipeline.cpp
2025-08-31 12:07:48 +02:00
ce6beeaad7
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-08-31 11:45:41 +02:00
3899506394
Updated Polish translations
2025-08-30 23:34:34 +02:00
86cc08f895
Notification correction; Rename -> Remove
2025-08-30 21:00:14 +02:00
1478dc3d33
Remove duplicated inventory settings context menu option
2025-08-30 20:12:55 +02:00
3836e507e7
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-08-30 12:22:35 +02:00
a60170b69c
Merge branch 'main' of https://github.com/secondlife/viewer
2025-08-30 12:13:26 +02:00
db69b09d82
Merge branch 'develop' into callum/viewer-cef-2025-08
2025-08-29 14:51:08 -07:00
e77eb6b531
#4598 Fix variables being inited before settings are ready
2025-08-29 20:38:43 +03:00
479fee984a
#4604 Warn user off high settings when on low-RAM hardware
2025-08-29 19:56:04 +03:00
e23aa06049
#4604 Reduce draw distance when low on RAM
2025-08-29 19:56:04 +03:00
842ac1e150
Merge pull request #4379 from secondlife/release/2025.06
...
Release/2025.06
2025-08-29 12:48:44 -04:00
5ffcd3dc88
Fixes for GHA build
2025-08-28 17:58:33 -04:00
d010e55b88
Tabs to spaces
2025-08-28 06:21:38 -04:00
f1014eda27
Bump openjpeg to 2.5.3-r1
2025-08-28 06:19:15 -04:00
2b44464a14
Fix up windows build error in GHA
2025-08-28 06:08:13 -04:00
96ff5f8e70
Merge branch 'develop' of github.com:secondlife/viewer into rye/infinitemac
2025-08-28 00:53:15 -04:00
77d71dec86
Fix up universal build
2025-08-28 00:43:38 -04:00
34ae3db498
Merge branch 'callum/viewer-cef-2025-08' into rye/infinitemac
2025-08-27 23:07:22 -04:00
dae43ad532
Fix cmake to ${CMAKE_COMMAND} to avoid cmake error
2025-08-27 23:05:58 -04:00
536c821c09
MacOS companion changes for dullahan 1.21 including package structure and linkage fixes
2025-08-27 23:05:40 -04:00
e629bf05d6
Changes to support dullahan 1.21 undo/redo/delete/select all edit handlers
2025-08-27 22:36:55 -04:00
87ec630053
PUll in Dullahan 1.21 that contains additional updates for the macOS version which should help with the slow media startup issue
2025-08-27 15:30:32 -07:00
b246834207
Merge pull request #4607 from secondlife/Dan-Linden-patch-2
...
Removed dan's z600 windows machine from the matrix. Added dan's mac, caleb's mac and kurt's windows machines.
2025-08-27 11:02:53 -07:00
0fc42e951f
#4608 Crash at LLJoint::findJoint
...
'this' is null inside findJoint according to bugsplat so likely mRoot
was not initialized yet.
2025-08-27 16:09:14 +03:00
180ebf3a32
Use PST/PDT when logged into OpenSim instead of SLT
2025-08-27 20:32:24 +10:00
e33439e523
Update qatest.yaml
...
corrected kurt's machine name to qa-windows-kurt
2025-08-26 15:18:10 -07:00
bbdb46a833
Update qatest.yaml
...
Removed dan's z600 windows machine from the matrix.
Added dan's mac, caleb's mac and kurt's windows machines.
2025-08-26 14:41:07 -07:00
8a585912ad
#4598 Crash in LLReflectionMapManager::update
...
Not enough data for a solid conclusion (does something create settings
in a thread?), but should be avoidable if we cache settings differently.
2025-08-26 21:11:47 +03:00
882fc91b0c
Added missing opacity overrides for filter editors in the conversations floater
2025-08-26 22:05:06 +10:00
b4a7ef835c
Refactored Conversations opacity override and made the callback to override transparency generic
2025-08-26 22:05:06 +10:00
88545c5ae7
Fixed settings error for FSImActiveOpacityOverride
2025-08-26 22:05:06 +10:00
da395c715c
Implemented seperate Conversations opacity options
2025-08-26 22:05:03 +10:00
154ed29e6f
Merge branch 'develop' of https://github.com/secondlife/viewer
2025-08-25 20:44:18 +02:00
62eb9fc935
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202506
2025-08-25 20:43:54 +02:00
8d220e4973
Merge branch 'release/2025.06' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llmeshrepository.cpp
# indra/newview/viewer_manifest.py
2025-08-25 20:42:31 +02:00
7cf3d31190
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/app_settings/settings.xml
2025-08-25 20:26:06 +02:00
9f50a5b25b
Merge pull request #4603 from secondlife/release/2025.06
...
Update develop with latest 2025.06 changes.
2025-08-25 09:14:09 -04:00
2d22a26753
Forgot one translation...
2025-08-25 11:28:39 +02:00
950fa11bcb
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llfloatersearch.cpp
# indra/newview/llstatusbar.cpp
# indra/newview/lltextureview.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/skins/default/xui/en/floater_search.xml
2025-08-25 11:26:30 +02:00
01a5f965c8
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-08-25 10:44:26 +02:00
d33feb5a82
Update German translation
2025-08-25 10:43:43 +02:00
452deed657
Merge pull request #155 from FirestormViewer/FIRE-35686
...
PR: FIRE-35686 & FIRE-35769
2025-08-23 17:39:31 +01:00
587897e5be
Merge branch 'master' into FIRE-35686
2025-08-23 16:51:35 +01:00
e935a8aebc
Merge branch 'develop' into callum/viewer-cef-2025-08
2025-08-22 17:12:03 -07:00
bebd1b208e
Bring in Dullahan 1.20.0 and by that, CEF 139.0.28. Update the CEF media plugin accordingly to take account of Dullahan cache changes
2025-08-22 17:10:29 -07:00
cefee59b0e
Improved open performance for some web based UI floaters by preloading the web content during login ( #4574 )
...
* First phase of some work to replace certain UI web based floaters with a much more simple floater (no more browserish web-content-floater) and then pre-load content as login is progressing. This means that after login, the floater can be opened much more rapidly than now. This first commit does this process for the Search floater
* This commit brings in a new marketplace floater than hosts the marketplace web page (no more webcontent floater here either). It works as expected and opens quickly but the user is not logged in when the page is opened so that needs to be tackled before we can declare that this is a viable solution
* This commit introduces a way to set the openID cookie that arrives via login.cgi into all the instances that are preloaded - the result is that when you open the preloaded floater after login, you are logged into your linden account
* Fix a mac only warning as error - function overrides a member function but is not marked 'override'
* Marchcat spotted left over cruft from earlier dev when we used a trimmed down URL for the pre-load search. Now we use the same search URL throughout and zero out the query parameters
2025-08-22 16:21:31 -07:00
489d1bb044
Add missing GLTF filter to mesh model loader on Linux
2025-08-22 22:43:24 +01:00
1022be6986
#4570 Sanity check bandwidth input
...
Going above this will just make server throttle things and viewer's
own throttlig won't be effective when viewer can't keep up.
2025-08-22 23:15:24 +03:00
3f65a4bfec
Fix test build on macOS
2025-08-22 13:13:03 -04:00
Ansariel