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
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
76460e8c2c
Use LLCachedControl to speed up voice enable/disable checking
2024-03-11 22:45:36 -07:00
37837edd69
Fixup some logic relating to teleporting and new regions
2024-03-11 22:12:21 -07:00
1f177d837c
fixup tabs
2024-03-11 14:41:12 -07:00
fc462b2b0f
Remove trailing spaces. Other code cleanup.
2024-03-10 00:11:43 -08:00
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
6d5304bd92
For webrtc, 'calling' dialog should remain up, disappearing when peer connects (p2p)
2024-03-05 11:05:31 -08:00
b17c668d12
fix webrtc logic bugs and such
2024-03-03 22:34:35 -08:00
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
7287cfbd7a
For spatial voice, determine voice provider based on server setting.
2024-02-22 14:34:03 -08:00
0cd8ad6ebb
Hang up when peer hangs up in ad-hoc driven p2p call
2024-02-08 18:35:55 -08:00
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
0ae8bbaf5d
Checkpoint WebRTC Voice
2024-02-08 18:34:00 -08:00
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
0c1f2366ff
FIRE-33532: Fix voice PTT toggle sound playing when it should not
2023-12-17 14:13:07 +01:00
d63bd14d81
FIRE-33249 Blip sound for when mic (voice) toggles on/off
2023-12-10 18:41:06 +01:00
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
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
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
daca555592
SL-19609 Urls aren't dispatched according to the indicated grid
2023-04-19 20:06:37 +03:00
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
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
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
f7010e46af
SL-18778 Crash at LLVoiceClient::removeObserver ( #25 )
2022-12-06 04:37:07 +02:00
401fa5a4e4
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2022-10-21 01:51:04 +02:00
26c8883bb7
Merge remote-tracking branch 'origin/SL-18119' into DRTVWR-548-maint-N
2022-09-22 19:13:13 +03:00
827420e2fe
SL-18119 - bug fix
2022-09-21 20:58:34 +01:00
3994101549
SL-18119 - more ViewerStats logs for NUX
2022-09-21 20:52:27 +01:00
f46a15b3f3
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
2022-01-11 15:04:11 +01:00
4dfecb6e1a
SL-13297 - Change names to match coding standard.
2022-01-06 16:33:38 -08:00
bdd8a52dfe
SL-13297 - Record and use build version reported by SLVoice
2022-01-06 15:44:21 -08:00
d271062749
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-04-02 16:53:23 +02:00
6240168f24
Merge branch 'master' into DRTVWR-515-maint
2021-04-01 20:45:06 +03:00
7ca874a6e3
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
2021-02-02 00:16:25 +01:00
a059e0d2e5
SL-3136 Logout crash fixes from Ansariel Hiller
2021-01-22 23:01:58 +02:00
6c587d437d
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
2020-12-02 08:17:58 +01:00
47bd603ceb
SL-13733 One more vivox shutdown crash
...
Vivox was using dead pump
2020-11-25 18:09:54 +02:00
5e65f3dfc3
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-11-12 16:54:23 +01:00
74c3b7a0ee
Merged master (DRTVWR-507) into DRTVWR-514-keymappings
2020-11-11 22:16:04 +02:00
ebe141327c
Merge branch 'DRTVWR-514-keymappings' of https://bitbucket.org/lindenlab/viewer
2020-06-24 10:30:51 +02:00
2532a2ee9e
SL-6109 Conflict resolution
2020-06-23 14:48:03 +03:00
4df05c5a89
SL-6109 Keyaboard support ready
2020-06-23 14:48:02 +03:00
3633ccf1a1
SL_6109 Rebinding
2020-06-23 14:48:02 +03:00
b9294516fc
SL-6109 Implement keybindings
2020-06-23 14:48:02 +03:00
64f80748e7
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-05-18 21:50:17 +02:00
deb1c21a7a
SL-13034 Last string in logs should say 'Goodbye'
...
Speaker volume saving was last instead of 'Goodbye'.
2020-05-13 19:45:42 +03:00
fd4b8a7bb1
Merge Firestorm LGPL
2019-11-12 18:45:02 +01:00
84f3b2865f
Merged in lindenlab/viewer-release
2019-11-12 00:39:07 +02:00
d79b79fbe2
Merge viewer-ordered-shutdown
2019-10-19 03:16:10 +02:00
Ansariel