Commit Graph

79244 Commits (950fa11bcb061b0a06b38ffc7d9f3907a15d3418)

Author SHA1 Message Date
Ansariel 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
Ansariel 01a5f965c8 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-08-25 10:44:26 +02:00
Ansariel d33feb5a82 Update German translation 2025-08-25 10:43:43 +02:00
Angeldark Raymaker 452deed657
Merge pull request #155 from FirestormViewer/FIRE-35686
PR: FIRE-35686 & FIRE-35769
2025-08-23 17:39:31 +01:00
Angeldark Raymaker 587897e5be Merge branch 'master' into FIRE-35686 2025-08-23 16:51:35 +01:00
Callum Linden 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
Beq 489d1bb044 Add missing GLTF filter to mesh model loader on Linux 2025-08-22 22:43:24 +01:00
Andrey Kleshchev 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
Andrey Kleshchev f5423d4517 #4570 Attemp to send logout message when lost network
To not leave a ghost behind and for faster reconnect
2025-08-21 16:21:52 +03:00
Andrey Kleshchev d5f748c91c #3223 Trim coroutine queues a little 2025-08-20 12:53:53 +03:00
Ansariel e78ac58683 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llcorehttp/_httpoprequest.cpp
#	indra/llcorehttp/httpoptions.cpp
2025-08-19 19:33:35 +02:00
Ansariel e8b42af7a7 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-08-19 19:16:16 +02:00
Hecklezz 1be2b04093 Added debug setting to hide help button from floaters 2025-08-20 03:10:50 +10:00
Ansariel 1227e538b1 Fix the particle editor 2025-08-19 13:34:08 +02:00
fmartian 89c373c20b
Add new LastModified option to HttpRequest handling (#4563)
* Add LastModified: option to the HttpOptions and handle it properly in HttpOpRequest::prepareRequest()

* grid_name could be empty if an invalid grid was passed in.
2025-08-18 12:16:54 -07:00
Brad Linden 527ee429e6
Merge pull request #4571 from secondlife/brad/develop
Cherry-pick packages-formatter fix from archive/develop
2025-08-18 10:56:02 -07:00
Nicky 181273f929 Change another case of a regex sequence needing to be a raw string 2025-08-18 10:44:06 -07:00
Beq 70768b815f Final permutation test. try gcc-13 and hope. 2025-08-17 21:38:24 +01:00
Angeldark Raymaker dc540f664d FIRE-35732: Manip changes imply zero base
when writing a BVH
2025-08-17 21:27:35 +01:00
Beq d7e2e91dca Merge branch 'try-22.04' 2025-08-17 21:18:28 +01:00
Beq e7a0751a2c Try g++-14 on the slow older runners :-( 2025-08-17 21:15:14 +01:00
Angeldark Raymaker 580b555258 Merge branch 'master' into FIRE-35686 2025-08-17 20:13:54 +01:00
Angeldark Raymaker e78080f111 FIRE-35769: Move lock button 2025-08-17 20:08:46 +01:00
Beq 2339174f66 Ubuntu 22.04 python is not python3 (I think) 2025-08-17 14:47:11 +01:00
Beq dabf5cc037 Fx indent 2025-08-17 14:26:21 +01:00
Beq 979593d5fb Workaround container needing 22.04 python 2025-08-17 14:18:02 +01:00
fmartian e7c506ba45
Fix regex strings for Python 3.12+
Python 3.12 and newer does complain about single backslash in strings and is probably going to treat it as an error in some future version. Make the string constant a raw string.
2025-08-16 17:34:50 -07:00
Ansariel f7cdf00583 Refactor some old code for minor performance improvements because why not? :) 2025-08-16 19:39:25 +02:00
Angeldark Raymaker a8d53fa9ae Update settings tab
add DoF edit-mode checkbox, move controls
2025-08-16 17:02:50 +01:00
Ansariel 2e38bd092d Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-08-16 13:45:36 +02:00
Ansariel 806b4b1f9d Sync with upstream fix 2025-08-16 13:38:39 +02:00
Ansariel 6f21013d89 Fix long standing build issue due to bug in build variables 2025-08-16 13:38:27 +02:00
Ansariel 4444bc8a27 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/tools/vstool/VSTool.csproj
#	indra/tools/vstool/VSTool.exe
#	indra/tools/vstool/VSTool.sln
#	indra/tools/vstool/main.cs
2025-08-16 12:38:56 +02:00
Ansariel bcaa272e91 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	indra/newview/gltf/asset.cpp
2025-08-16 12:35:36 +02:00
Ansariel df2df95a88 Reapply "Fix RelWithDebug compile issue in gltf\asset.cpp"
This reverts commit 42bf6d155e.
2025-08-16 11:46:57 +02:00
Signal Linden 68d3d5cd73
Remove unused vstool, files (#4500)
Clean up of some unused files:

- vstool - No longer used
- indra/edit-me-to-trigger-new-build.txt - Shouldn't be needed...
- win_crash_logger/* - Empty directory
2025-08-15 19:57:55 -07:00
minerjr 42bf6d155e Revert "Fix RelWithDebug compile issue in gltf\asset.cpp"
This reverts commit 0898e6dbb8.
2025-08-15 19:54:21 -03:00
minerjr 0898e6dbb8 Fix RelWithDebug compile issue in gltf\asset.cpp
In indra\newview\gltf\asset.cpp when you compile in Visual Studio for windows with RelWithDebug, there is a compiling error due to #if being used instead #ifdef as the rest of the codebase uses. This is with the latest Visual Studio  17.14.11.

The error given is
Severity	Code	Description	Project	File	Line	Suppression State	Details
Error (active)	E0029	expected an expression	firestorm-bin	G:\minerjr\firestorm\phoenix-firestorm\indra\newview\gltf\asset.cpp	592

Just changed #if's to #ifdef.

Also moved the second #if to #ifdef on line 611 up before the assert as in Release both checks use the attribute_mask which is not defined as its only exists when SHOW_ASSERT exists.
2025-08-15 14:34:04 -03:00
Beq 6833849876 Need to adjust runs-on to pick up the container properly 2025-08-15 18:12:38 +01:00
Beq 16a2ae0179 Use sudo inside dockerised Ubuntu 2025-08-15 17:02:34 +01:00
Beq a43c11bbaa Test containerised build on Linux with g++14 toolchain. 2025-08-15 14:22:21 +01:00
Ansariel 9c73af6e2a Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/CMakeLists.txt
2025-08-14 20:30:27 +02:00
Ansariel 6491cb0307 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202506 2025-08-14 20:08:01 +02:00
Ansariel c40e58fd04 Adjust error message to new format 2025-08-14 20:07:00 +02:00
Ansariel 0226b1c1f2 Update German translation 2025-08-14 20:04:17 +02:00
Ansariel ec481a060e Merge branch 'release/2025.06' of https://github.com/secondlife/viewer 2025-08-14 19:58:38 +02:00
Angeldark Raymaker fb06fd9506 Merge branch 'master' into FIRE-35686 2025-08-14 18:45:15 +01:00
Brad Linden 4c65a43e17
CMake 4.10 compatibility fixes (#4548) 2025-08-14 09:47:22 -07:00
Andrey Kleshchev 6f072c2121
Merge 2025.06 into develop
Merge 2025.06 into develop
2025-08-14 11:17:35 +03:00
Andrey Kleshchev d859557c18 #4541 Cap image upload size to prevent issues 2025-08-13 23:07:12 +03:00