04bed35215
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llwebrtc/llwebrtc.h
# indra/newview/llfloateremojipicker.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
2024-08-02 13:01:06 +02:00
d3ba6ca08c
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-atlasaurus
2024-08-02 12:04:58 +02:00
daa240164d
Post pull request contribution doc update ( #2077 )
2024-08-02 13:02:36 +03:00
44c825e821
Merge branch 'release/2024.06-atlasaurus' of https://github.com/secondlife/viewer
2024-08-02 12:02:23 +02:00
b0a053d447
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-webrtc-voice
2024-08-02 12:00:46 +02:00
fa4ad236fc
Merge branch 'release/webrtc-voice' of https://github.com/secondlife/viewer
2024-08-02 11:59:06 +02:00
e26280f10e
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-08-02 11:58:44 +02:00
793f5ac341
Crash at LLViewerTexture::updateClass()
2024-08-02 12:21:11 +03:00
0ff2bd1a40
Merge remote-tracking branch 'origin/release/2024.06-atlasaurus' into develop
2024-08-01 15:42:22 -07:00
002be0f243
Merge remote-tracking branch 'origin/release/webrtc-voice' into release/2024.06-atlasaurus
2024-08-01 15:40:41 -07:00
f9377566b9
Merge pull request #2168 from RyeMutt/emoji-fixes
...
Emoji picker warning fixes and cleanup
2024-08-01 22:56:32 +03:00
212b1edd2d
Fix trying to bind to non-existent texunit sampler during water draw ( #2128 )
2024-08-01 22:50:23 +03:00
5f66a15142
Merge pull request #2162 from secondlife/roxie/webrtc-voice-crash-detect
...
[WebRTC] Implement a Logging Sink for WebRTC
2024-08-01 09:33:33 -07:00
4217a778d6
Fix excessive wstring conversions during emojipicker draw
2024-08-01 11:51:31 -04:00
0723308c9c
Fix emojipicker floater group buttons leaking and xui warning
2024-08-01 11:51:31 -04:00
86668633c3
Fix failure to join or detach threads causing rare shutdown termination
2024-08-01 17:54:25 +03:00
8f6e623a5f
viewer#2163 Crash at getReflectionProbeIsDynamic
2024-08-01 16:04:26 +03:00
06ce9ac802
viewer#2157 Toolbar's drop position indicator does not appear
2024-08-01 13:24:14 +03:00
b9c222dfae
Implement a Logging Sink for WebRTC
...
WebRTC logs now pass out of the webrtc library into a logging sink,
which converts them into SecondLife.log compatable logging calls.
This includes fatal errors and asserts, which are now logged into
SecondLife.log, and should be available in the crash logger.
2024-07-31 21:23:30 -06:00
c4595b60f8
swap deprecated parameter for suggested replacement
2024-07-31 21:03:48 +02:00
f76b45e729
Make voice chat preferences panel fit better
2024-07-31 21:00:16 +02:00
89d5e8bf4f
Merge pull request #2155 from secondlife/roxie/webrtc-voice-crash-detect
...
[WebRTC] Use new webrtc lib with crash-on-fatal support
2024-07-31 09:51:15 -07:00
beb177bb23
viewer#2153 Crash at LLViewerTextureList::updateImageDecodePriority
...
Crash at getTextureEntry which calls getTE(mTEOffset)
2024-07-31 18:16:18 +03:00
c3b678276d
viewer#2144 Correct unclear terminilogy in region's debug panel
2024-07-31 15:57:46 +03:00
3e25b1151c
Fix order of initialisation and uncaught exception in destructor
2024-07-31 13:27:32 +01:00
bff3875096
use modern (default) impl rather than empties.
2024-07-31 13:26:36 +01:00
774461e851
Modernise and use override where possible to keep clang happy
2024-07-31 13:25:38 +01:00
2582e4a47a
Use new webrtc lib with crash-on-fatal support
2024-07-30 16:53:46 -06:00
dfa7d60a72
build.yaml: Fix FROM_FORK value, ReleaseOS PR builds ( #2147 )
2024-07-30 10:09:49 -07:00
0c70d3c616
Cache LLVOAvatar::isBuddy check to reduce repeated calls to LLAvatarTracker::isBuddy during draw ( #2149 )
2024-07-30 17:53:38 +03:00
93a4e5a88e
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-atlasaurus
2024-07-30 15:50:41 +02:00
4969c9a819
Unhackerish hackery workaround for easier merge cleanup
2024-07-30 15:49:52 +02:00
bc1b842e1b
fire-34335 italian translation update by spartaco zemenis
2024-07-30 13:36:27 +02:00
4664a09afb
apply tooltip change to all affected languages
2024-07-30 13:29:28 +02:00
a7177cc4b6
viewer#2121 Don't update Audio visualizer if voice is blocked
2024-07-30 14:19:25 +03:00
1e8a24d537
Update German translation
2024-07-30 12:37:10 +02:00
02680c6a8f
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Boost.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llaudio/llaudiodecodemgr.cpp
# indra/llxml/llxmltree.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llfloaterworldmap.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llinventorygallerymenu.cpp
# indra/newview/llpanelgroup.cpp
# indra/newview/llpanelgroup.h
# indra/newview/llpanelprofile.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/viewer_manifest.py
2024-07-30 12:32:41 +02:00
5b2c76d08b
Fix tool tip for point lights.
2024-07-30 11:19:10 +02:00
eaa5dc798c
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-atlasaurus
...
# Conflicts:
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llversioninfo.cpp
# indra/newview/llviewertexturelist.cpp
2024-07-30 10:45:11 +02:00
8640ed016b
Merge branch 'release/2024.06-atlasaurus' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llfloaterregioninfo.cpp
2024-07-30 10:38:11 +02:00
0b9ac4ee19
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/llwindow/llwindowsdl2.cpp
2024-07-30 10:37:17 +02:00
73788b2c67
FIRE-34348: Update outdated tool tip for point lights
2024-07-30 10:31:13 +02:00
4eab7c2b1c
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-atlasaurus
2024-07-30 10:21:48 +02:00
c6c2a51e9c
Don't show negative amount of available memory in texture console
2024-07-30 10:20:07 +02:00
34cc2de079
fix another misleading indentation compiler warning
...
Fix indentation mistake that trips gcc's misleading indentation warning.
2024-07-30 08:07:56 +03:00
f75735d741
viewer-private#255 p2p outgoing calls did not work correctly #2
2024-07-30 07:31:05 +03:00
7b119c01e0
viewer-private#255 p2p outgoing calls did not work correctly
...
Issue:
P2P was catching STATUS_LEFT_CHANNEL meant for nearby chat and adopting
channel info for itself
Solution:
- Moved one of notifyStatusObservers calls so that it would have uri
data instead of firing with no channel info
- Made p2p sessions init with uri data, like it was before webrtc. Which
is used to distinguish observer notifications.
- Removed mAudioSessionChanged. It was unused yet confusing.
2024-07-30 07:31:05 +03:00
9e4cc30b29
viewer#2142 Crash at LLOutfitGalleryItem::setDefaultImage
2024-07-30 07:27:52 +03:00
ff891ca38d
FIRE-34277 - particles are refusing to rez
...
Oddly, calling getPixelArea() before calcPixelArea() is correct. This makes no sense but things break if we don't!
2024-07-29 21:30:58 +01:00
d881c72a9a
Merge pull request #2143 from secondlife/signal/rm-build-crust
...
build.yaml: Remove unused BUILD variable
2024-07-29 12:07:27 -07:00
Ansariel