a17fd2352a
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcharacter/llkeyframemotion.cpp
# indra/llcharacter/llmotioncontroller.cpp
# indra/llcrashlogger/llcrashlogger.cpp
# indra/llimage/llimagetga.cpp
# indra/llmessage/llregionflags.h
# indra/llprimitive/lldaeloader.cpp
# indra/llprimitive/llmodel.cpp
# indra/llrender/llrendertarget.cpp
# indra/llui/llconsole.cpp
# indra/llui/llkeywords.cpp
# indra/llui/llscrolllistctrl.cpp
# indra/llui/lltextbase.cpp
# indra/llui/lltexteditor.cpp
# indra/llui/llurlentry.cpp
# indra/newview/llappearancemgr.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llgiveinventory.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llpanelpeople.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelteleporthistory.cpp
# indra/newview/llvocache.cpp
2024-06-09 16:11:24 +02:00
7c065a3e9a
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-06-09 10:53:21 +02:00
22d3ea34f2
Merge pull request #1613 from Ansariel/DRTVWR-600-maint-A
...
Fix/re-enable MSVC compiler warnings
2024-06-09 00:48:45 +03:00
64d2045c13
Merge branch 'main' of https://github.com/secondlife/viewer
2024-06-08 11:20:54 +02:00
69b48fd13a
viewer#1645 Expose RenderLocalLightCount in UI
2024-06-07 19:36:51 +03:00
1fda083f6c
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# .gitattributes
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/newview/llpanelface.cpp
2024-06-07 11:58:50 +02:00
b740bfb21c
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/llviewermenu.cpp
2024-06-07 10:47:15 +02:00
6edfe9b3c5
Linux: switch to boost::json
2024-06-06 18:12:56 +02:00
2c53972d34
Merge branch 'main' into DRTVWR-600-maint-A
...
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
2024-06-06 16:12:06 +03:00
e60adafa33
viewer#1641 Show accurate Alpha mode if asset is missing
2024-06-06 15:27:10 +03:00
d317454c82
Merge pull request #1639 from secondlife/nat/stack-overflow
...
Make LLLeap iterate over child stdout while read data is pending
2024-06-05 13:36:56 -04:00
391893a325
Make LLLeap iterate over child stdout while read data is pending
...
instead of using mutual recursion to exhaust the read buffer.
2024-06-05 12:12:48 -04:00
7d779aacaf
Hide option to add grids on Havok-Builds
2024-06-05 12:05:31 +02:00
7c1b60aeba
Enable multi-properties floater for task inventory
2024-06-04 21:32:42 +02:00
2a73551f8b
FIRE-33958 - Tentative fix for zombie notifications
...
I've only had limited success in reproducing this, so that fact I can't repro after fixing is not that compelling. However, when the issue occurs the underlying notification has been removed but the UI remains, this seems consistent with notification list being updated outside of the mutex guard and causing issues.
Note: LLNotifications has a number of methods that do an initial find and then call updateItem. I have not, at this point locked the higher livel calls as the updateItem call itself is locked and the higher level find is not likely to be problematic. If problems persist we can try guarding those too.
2024-06-04 01:26:59 +01:00
f862fc375c
Disable the pointless hardware check unless someone really wants them
2024-06-04 01:19:04 +01:00
395c1c6adf
Remove obsolete Windows package for llphysicsextensions_source
2024-06-03 14:49:29 +02:00
fa2b0e2135
Fix Windows build following #1613
2024-06-03 14:48:01 +02:00
08c483c269
viewer#1583 [Win] Viewer fails to detect more than 4Gb of video memory
2024-06-03 10:08:35 +03:00
05be30749d
FIRE-33972, FIRE-33974: Updated French (by Laurent Bechir), Russian (by Romka Swallowtail) and Polish translations - login panel
2024-06-02 18:06:12 +02:00
3316049ba7
FIRE-33849: Fix Favorite Wearables list not updating properly when filtering
2024-06-02 16:01:13 +02:00
14cc5f026b
Update German translation
2024-06-02 02:37:56 +02:00
ecf297e6a1
unb0rk the indents that broke somehow.
2024-06-01 21:57:20 +01:00
4dbfc5136b
Merge branch 'newgridlist'
2024-06-01 21:50:41 +01:00
8952e143bb
[OPENSIM] New grid builder for OpenSim
...
Integrate with login, Note: hop URLS nor supported by Dullahan
replace grids.xml with a minimal grids list.
Update settings and grids.xml for the new grid builder.
update legacy login page too
2024-06-01 21:49:23 +01:00
07e1d7bf7f
Fix macOS build error
2024-06-01 16:31:34 +02:00
b42f9d836b
Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings
2024-06-01 15:49:26 +02:00
ed1484a513
Put Hypergrid handling in its own namespace
2024-06-01 12:31:49 +02:00
78db0ada82
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-05-31 20:17:05 +02:00
0478229bcb
FIRE-33963 French translation update, by Laurent Bechir
2024-05-31 20:16:59 +02:00
32d9d43118
Fix crash due to invalidated reference use after erase.
2024-05-31 18:57:23 +01:00
47c1fbea3e
viewer#1600 Fixed being unable to delete links to worn objects
2024-05-31 14:24:29 +02:00
ac0d6afb63
Clean Hypergrid region name handling a bit and only include in OpenSim builds
2024-05-30 21:40:53 +02:00
c5fd57d3bd
FIRE-33922 - starlight skin fixes by ScentualLust
2024-05-30 16:21:41 +01:00
4b02d6f1ef
Add FS header blocks
2024-05-30 16:21:41 +01:00
fe2268294e
Merge branch 'FIRE-31368/fix-some-hop-urls'
2024-05-30 16:14:20 +01:00
cb3bd8865a
Fix a bunch of uninitialized variable warnings that showed up in Visual Studio
2024-05-30 15:41:36 +02:00
6f325f91d7
+-newline
2024-05-30 13:39:09 +01:00
2d59292228
prefer constexpr over defines; add runtime isInOpenSim check
2024-05-30 13:39:09 +01:00
61f7c7e08f
cleanup; refactor code units per CR feedback
2024-05-30 13:39:09 +01:00
19969394ab
FIRE-31368 prototype hop url fixes
2024-05-30 13:39:09 +01:00
ab677cbb2b
Merge branch 'Tracy010Updates'
2024-05-30 13:33:18 +01:00
7d8608d1a3
Merge branch 'master' of ssh://github.com/FirestormViewer/phoenix-firestorm
2024-05-30 13:32:14 +01:00
c082f6f67a
Re-enable compiler warning C4800 (performance warning)
2024-05-30 13:11:50 +02:00
891162d0a3
Fix a few things and update the autobuild to the new file
...
Tools for this version are https://3p.firestormviewer.org/Tracy.zip
2024-05-29 23:53:18 +01:00
5f190b112e
Additional profiling scopes and remove some superfluous ones.
2024-05-29 20:46:34 +01:00
a7be29cf14
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-05-28 22:37:35 +02:00
1541ad5847
FIRE-33951 Russian translation update, by Romka Swallowtail
2024-05-28 22:37:16 +02:00
a91ba82c41
Add TRACY ENABLE exclusion to custom blocks
2024-05-28 18:19:18 +01:00
b254e49ddc
Minimalist changes for Tracy010
2024-05-28 18:16:00 +01:00
Ansariel