Ansariel
fa4ad236fc
Merge branch 'release/webrtc-voice' of https://github.com/secondlife/viewer
2024-08-02 11:59:06 +02:00
Andrey Kleshchev
f75735d741
viewer-private#255 p2p outgoing calls did not work correctly #2
2024-07-30 07:31:05 +03:00
Ansariel
035d3506dc
Merge branch 'release/webrtc-voice' of https://github.com/secondlife/viewer
2024-07-25 18:34:11 +02:00
Brad Linden
26a01ced9a
Improve error message notifying user that Voice Morph Effects are not supported
...
secondlife/viewer#1451
2024-07-23 17:32:59 -07:00
Ansariel
f04ed0e5e4
Merge branch 'release/webrtc-voice' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/llspeakers.cpp
# indra/newview/llvocache.cpp
# indra/newview/llvoiceclient.cpp
# indra/newview/skins/default/xui/de/menu_viewer.xml
# indra/newview/skins/default/xui/en/panel_preferences_sound.xml
# indra/newview/skins/default/xui/es/menu_viewer.xml
# indra/newview/skins/default/xui/it/menu_viewer.xml
# indra/newview/skins/default/xui/ja/menu_viewer.xml
# indra/newview/skins/default/xui/pl/menu_viewer.xml
# indra/newview/skins/default/xui/pt/menu_viewer.xml
# indra/newview/skins/default/xui/ru/menu_viewer.xml
# indra/newview/skins/default/xui/tr/menu_viewer.xml
# indra/newview/skins/default/xui/zh/menu_viewer.xml
2024-07-18 20:27:40 +02:00
Roxie Linden
3c71230aa4
don't set voice font for vivox
2024-07-02 21:03:30 -07:00
Roxie Linden
af21783ffa
EnableVoiceMorphing should default to true
2024-07-02 13:52:51 -07:00
Roxie Linden
3eab42ebd8
Disable voice morphing and throw up a warning if it's previously enabled.
2024-06-21 13:22:12 -07:00
Ansariel
4b0ad849a9
Merge remote-tracking branch 'LL/project/webrtc-voice'
...
# Conflicts:
# autobuild.xml
# indra/cmake/WebRTC.cmake
2024-05-21 00:42:55 +02:00
Ansariel
3da533c5eb
Merge remote-tracking branch 'LGPL/master'
...
# Conflicts:
# autobuild.xml
2024-05-20 23:46:53 +02:00
Roxie Linden
3a212d9608
Merge branch 'spaces-merge' into roxie/webrtc-voice
2024-05-20 12:59:59 -07:00
Roxie Linden
2b275d43fb
Clean up some shutdown code.
2024-05-17 13:27:45 -07:00
Roxie Linden
cfd358f933
WebRTC clients calling Vivox clients should handle P2P
2024-05-16 13:34:13 -07:00
Ansariel
223ac67c75
Merge branch 'project/webrtc-voice' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/llvoicevivox.cpp
2024-05-12 17:16:46 +02:00
Roxie Linden
c628c1f6e4
Fix some session shutdown/error handling code
2024-05-08 14:22:43 -07:00
Ansariel
5e5edd78ed
Merge branch 'webrtc-voice' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
2024-05-03 14:00:17 +02:00
Ansariel
5f1a19af72
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
...
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
2024-05-01 12:30:57 +02:00
Andrey Lihatskiy
1b68f71348
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
2024-04-29 07:56:09 +03:00
Roxie Linden
1a1af1ce29
Adjust logic for determine what voice server type to use.
2024-04-20 00:26:39 -07:00
Ansariel
5e75273b49
Merge branch 'webrtc-voice' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/00-Common.cmake
# indra/newview/app_settings/settings.xml
# indra/newview/llagent.cpp
# indra/newview/llgroupactions.cpp
# indra/newview/llimview.cpp
# indra/newview/llpanelpeople.h
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoiceclient.cpp
# indra/newview/llvoiceclient.h
# indra/newview/llvoicevivox.cpp
# indra/newview/llvoicevivox.h
# indra/newview/viewer_manifest.py
# scripts/messages/message_template.msg.sha1
2024-03-19 17:09:42 +01:00
Roxie Linden
dbbbbc55af
Refactor device selection logic
...
This refactor fixed a few bugs. There is an annoying 'click' when
changing devices, however. This will be addressed in the future.
2024-03-14 20:04:39 -07:00
Roxie Linden
76460e8c2c
Use LLCachedControl to speed up voice enable/disable checking
2024-03-11 22:45:36 -07:00
Roxie Linden
37837edd69
Fixup some logic relating to teleporting and new regions
2024-03-11 22:12:21 -07:00
Roxie Linden
1f177d837c
fixup tabs
2024-03-11 14:41:12 -07:00
Roxie Linden
fc462b2b0f
Remove trailing spaces. Other code cleanup.
2024-03-10 00:11:43 -08:00
Roxie Linden
42c7a335f8
Fix issue with spatial and p2p being up at the same time
...
Also, fix issue with voice still happening in parcels where voice is
disabled.
2024-03-07 23:13:11 -08:00
Roxie Linden
6d5304bd92
For webrtc, 'calling' dialog should remain up, disappearing when peer connects (p2p)
2024-03-05 11:05:31 -08:00
Roxie Linden
b17c668d12
fix webrtc logic bugs and such
2024-03-03 22:34:35 -08:00
Roxie Linden
2117f8c4ba
Refactor for vivox spatial and p2p
...
General refactoring to improve vivox spacial and p2p voice
including generalizing voice info instead of just using
sip uri and credentials. Voice server type is also passed
around in the generalized voice info blob.
2024-03-03 15:50:35 -08:00
Roxie Linden
7287cfbd7a
For spatial voice, determine voice provider based on server setting.
2024-02-22 14:34:03 -08:00
Roxie Linden
0cd8ad6ebb
Hang up when peer hangs up in ad-hoc driven p2p call
2024-02-08 18:35:55 -08:00
Roxie Linden
0e6103e3a9
Checkpoint Ad-Hoc voice.
...
Unlike vivox, P2P uses the ad-hoc voice mechanism, which is also used by
group voice.
2024-02-08 18:35:21 -08:00
Roxie Linden
0ae8bbaf5d
Checkpoint WebRTC Voice
2024-02-08 18:34:00 -08:00
PanteraPolnocy
cdbcbf09e7
FIRE-33532 Cover the remaining cases for mic toggle: hotkey / mouse, activation/deactivation without PTT checkbox selected
2023-12-17 15:25:52 +01:00
Ansariel
0c1f2366ff
FIRE-33532: Fix voice PTT toggle sound playing when it should not
2023-12-17 14:13:07 +01:00
PanteraPolnocy
d63bd14d81
FIRE-33249 Blip sound for when mic (voice) toggles on/off
2023-12-10 18:41:06 +01:00
Ansariel
137f5d145e
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/llagentlistener.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llcommanddispatcherlistener.cpp
# indra/newview/llfilepicker_mac.mm
# indra/newview/llworldmapview.cpp
2023-05-18 14:03:52 +02:00
Andrey Lihatskiy
033b04f388
Merge branch 'main' into DRTVWR-582-maint-U
...
# Conflicts:
# indra/newview/llagentlistener.cpp
# indra/newview/llcommanddispatcherlistener.cpp
# indra/newview/llfilepicker_mac.mm
# indra/newview/llworldmapview.cpp
2023-05-17 18:05:05 +03:00
Ansariel
9b93864eb9
Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llcommon/tests/llleap_test.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfilepicker_mac.mm
# indra/newview/llinventorymodel.cpp
# indra/newview/llstartup.cpp
# indra/newview/llurldispatcher.cpp
# indra/newview/llvieweraudio.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
# indra/newview/skins/default/xui/en/strings.xml
2023-04-21 14:22:42 +02:00
Andrey Kleshchev
daca555592
SL-19609 Urls aren't dispatched according to the indicated grid
2023-04-19 20:06:37 +03:00
Ansariel
1772ae4c6c
Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewerwin32.cpp
# indra/newview/skins/default/xui/en/floater_about_land.xml
# indra/newview/skins/default/xui/en/panel_preferences_chat.xml
2023-03-07 14:21:43 +01:00
Andrey Kleshchev
8032b2d72e
SL-19204 Crash at removeObserver
...
A lot of reports about crashes in voice's removeObserver with no indication of the cause, all MAC specific. By this point terminate should have been called and mVoiceModule should be null, yet callstaks suggest it isn't.
Commit clears LLVoiceClient beforehand to avoid the issue entirely, but issue lies elsewhere and 'voice' crash is just a symptom.
2023-02-17 00:51:18 +02:00
Ansariel
5f81627faf
Merge branch 'DRTVWR-570-maint-Q' of https://github.com/secondlife/viewer
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloateravatar.h
2022-12-12 22:11:54 +01:00
akleshchev
f7010e46af
SL-18778 Crash at LLVoiceClient::removeObserver ( #25 )
2022-12-06 04:37:07 +02:00
Ansariel
401fa5a4e4
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2022-10-21 01:51:04 +02:00
Andrey Lihatskiy
26c8883bb7
Merge remote-tracking branch 'origin/SL-18119' into DRTVWR-548-maint-N
2022-09-22 19:13:13 +03:00
Brad Payne (Vir Linden)
827420e2fe
SL-18119 - bug fix
2022-09-21 20:58:34 +01:00
Brad Payne (Vir Linden)
3994101549
SL-18119 - more ViewerStats logs for NUX
2022-09-21 20:52:27 +01:00
Ansariel
f46a15b3f3
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
2022-01-11 15:04:11 +01:00
Howard Stearns
4dfecb6e1a
SL-13297 - Change names to match coding standard.
2022-01-06 16:33:38 -08:00