1adf2d00eb
Fix usage of $branch before it was initialized in build.
2024-08-22 15:46:48 -07:00
fc7082e93d
Merge remote-tracking branch 'origin/release/2024.06-atlasaurus' into release/2024.08-DeltaFPS
2024-08-22 14:06:07 -07:00
25c4ba3a76
#2397 Sanity clamp haze contribution to avoid NaN like blowouts. ( #2402 )
2024-08-22 15:59:22 -05:00
c2402afd8b
Merge remote-tracking branch 'origin/release/2024.06-atlasaurus' into release/2024.08-DeltaFPS
...
# Conflicts:
# indra/newview/featuretable_mac.txt
2024-08-22 11:15:11 -07:00
33c7a879c1
Bump featuretable versions to fix secondlife/viewer#2345 ( #2386 )
...
also fixed mac High entry for RenderMirrors that got missed
2024-08-21 12:02:21 -07:00
27fa9b8138
Merge pull request #2372 from secondlife/roxie/webrtc-fix-mac-p2p-hang
...
Fix hang when incoming p2p or group calls throw up dialog.
2024-08-21 09:49:54 -07:00
f3e186379c
Merge pull request #41 from AngeldarkRaymaker/Fire-31508
...
FIRE-31508: check folder limit before attaching all the things in a f…
2024-08-21 16:22:12 +02:00
de9374f0eb
Remove redundant USE_TRACY option
2024-08-21 03:14:39 +02:00
7b1d1852c2
Merge branch 'release/2024.06-atlasaurus' of github.com:secondlife/viewer into roxie/webrtc-fix-mac-p2p-hang
2024-08-20 17:17:16 -07:00
7560bd0be2
removed unnecessary comment
2024-08-20 17:14:00 -07:00
16db785e2f
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-atlasaurus
...
# Conflicts:
# indra/newview/featuretable.txt
# indra/newview/llpanelpeople.cpp
2024-08-21 01:54:01 +02:00
d070c175e0
Clean up PCH
2024-08-21 01:06:19 +02:00
59bf1d192b
Merge branch 'release/2024.06-atlasaurus' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/featuretable_linux.txt
2024-08-21 01:02:53 +02:00
50922b7520
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-08-21 00:50:24 +02:00
3d1d2cc3a2
Fixed missing change from 25ede86382
2024-08-21 00:48:33 +02:00
830eeaa6ff
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llagentwearables.cpp
# indra/newview/llface.cpp
# indra/newview/llpanelpeople.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llviewertexturelist.cpp
2024-08-21 00:46:46 +02:00
45ebc5867a
Fix hang when incoming p2p or group calls throw up dialog.
...
There were changes in atlasaurus that resulted in a hang for incoming p2p
and group calls which throw up dialogs. The changes revolved around mutex,
coroutines, job queues, and such.
The fix was to do any processing that may result in callbacks from
the webrtc code in a queued job instead of a coroutine.
2024-08-20 15:34:20 -07:00
738b39fbab
Merge pull request #2370 from secondlife/geenz/fix/increment-featuretable
...
#2345 Fix for mirrors not being disabled from previous viewer versions.
2024-08-20 14:55:59 -07:00
56e1687680
#2345 Fix for mirrors not being disabled from previous viewer versions.
2024-08-20 14:05:40 -07:00
765652e337
FIRE-31508: Remove/move unneeded gets
2024-08-20 20:01:28 +01:00
a0da63db57
Merge pull request #2365 from secondlife/marchcat/lib-updates
...
3p-lib updates
2024-08-20 21:29:52 +03:00
a469bd0ee5
Increment viewer version in preparation for 2024.08-d RC
2024-08-20 11:12:57 -07:00
4149fba7d5
Update colladadom to 2.3.0-r8
...
after updating boost
2024-08-20 20:55:38 +03:00
355c4a7109
Update boost to v1.86
2024-08-20 20:30:12 +03:00
5c936e26c0
Update freetype to v2.13.3
2024-08-20 20:05:29 +03:00
dda514ceb8
Update tinyexr to v1.0.9
2024-08-20 20:03:50 +03:00
68f712615f
Merge remote-tracking branch 'origin/release/2024.06-atlasaurus' into develop
...
# Conflicts:
# autobuild.xml
# indra/newview/llvoicewebrtc.cpp
2024-08-20 09:44:14 -07:00
9f7dd01772
Clean up boost includes and remove compiler warning pragma for unreachable code in PCH ( #2361 )
2024-08-20 18:41:48 +03:00
37dcb67d42
viewer#2338 Don't allow pasting into library from My Environments
2024-08-20 18:27:29 +03:00
1d017b7629
Trim trailing blank line.
2024-08-20 08:28:35 -04:00
ed6732eda8
#2315 Ensure textures are deleted when they are no longer referenced. ( #2343 )
...
* #2315 WIP -- Clean up deletion rules in texture list. Incidental decruft.
* Touch up assertions.
* Move mLastReferencedTimer to LLViewerMediaTexture since it's no longer used by LLViewerTexture
2024-08-20 06:59:07 -05:00
16c9c47f14
#2354 Enable Tracy on test builds ( #2357 )
...
* #2354 Enable Tracy on test builds
* Only enable Tracy by default on windows
2024-08-20 06:50:33 -05:00
01f9dbc4e3
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llallocator_heap_profile.cpp
# indra/llui/lllayoutstack.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/lltextureview.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/panel_preferences_colors.xml
2024-08-20 11:21:57 +02:00
63fccba774
Remove BOOL hack leftovers
2024-08-20 10:37:17 +02:00
f92c2040b9
Follow up for 4fa41c5 breaking inbox search/hiding ( #2356 )
2024-08-20 09:21:57 +03:00
342eee5038
SL-15061 Crash at LLConversationItemSession::clearAndDeparentModels #3
2024-08-20 09:20:52 +03:00
75a5cd62d7
Merge pull request #2355 from secondlife/geenz/cherrypick/mirrors-disable
...
Cherry pick mirror disablement from develop.
2024-08-19 17:16:46 -05:00
169599fd2f
Fix a bunch of XUI errors ( #2347 )
...
* Fix a bunch of XUI errors
* Change TRUE to true
2024-08-20 00:48:07 +03:00
862a4671f2
Remove orphaned LLAllocator ( #2348 )
2024-08-20 00:47:42 +03:00
b5754c8816
#2345 Disable mirrors from the feature table regardless of quality level. ( #2352 )
2024-08-19 14:39:39 -07:00
600635f900
#2345 Disable mirrors from the feature table regardless of quality level. ( #2352 )
2024-08-19 14:37:08 -07:00
6dd8dcb9ce
Merge pull request #2329 from RyeMutt/probe-fixes
...
Various fixes to probe memory usage
2024-08-19 20:15:47 +03:00
571155c561
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llfilesystem/lldiskcache.cpp
# indra/llfilesystem/lldiskcache.h
# indra/llfilesystem/llfilesystem.cpp
# indra/llui/llaccordionctrl.cpp
# indra/llui/llaccordionctrl.h
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatersettingsdebug.h
# indra/newview/llfloatertools.cpp
# indra/newview/llfloatertools.h
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llpanelpeople.cpp
# indra/newview/llpreviewnotecard.cpp
# indra/newview/llpreviewnotecard.h
# indra/newview/llpreviewscript.cpp
# indra/newview/llpreviewtexture.cpp
# indra/newview/llscreenchannel.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
2024-08-19 18:55:52 +02:00
f929c4f0fd
viewer#2342 Return AvatarBakedTextureUploadTimeout
...
Partial rollback of d00b6e4
2024-08-19 19:46:58 +03:00
1c7bc351d6
Merge pull request #2328 from secondlife/roxie/webrtc-airpod-fixes
2024-08-19 08:14:44 -07:00
ee320b22b3
#2289 BugSplat Crash #1496385 : SecondLifeViewer!LLFocusableElement::~LLFocusableElement(79)
2024-08-19 12:17:20 +02:00
b258ea4485
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-08-19 12:15:08 +02:00
8f658804bc
viewer#2310 Highlight image size when over limit for profile feed
2024-08-19 12:22:40 +03:00
627d512c47
viewer#2311 When email or profile image upload fails show a more fitting reason
2024-08-19 12:22:40 +03:00
0f3ffb0fad
Merge pull request #2324 from secondlife/roxie/webrtc-log-devices
...
[WebRTC] Log WebRTC devices on webrtc initialization.
2024-08-19 00:50:14 -07:00
Brad Linden