Commit Graph

117 Commits (b6ba43bed5dafd0f19862d2ff637909829fdc96f)

Author SHA1 Message Date
Andrey Kleshchev 7ec9736200 #4675 Voice indicator did not reappear after tuning
resume() was trigggering sOnCurrentChannelChanged which was wiping
participant list with no follow up updates.
2025-09-16 09:29:59 +03:00
Andrey Lihatskiy 5d7a5001b4 Merge commit '9e24b30' into marchcat/maint-c/restore
# Conflicts:
#	indra/llmath/v2math.cpp
#	indra/llmath/v2math.h
#	indra/llmath/v3math.h
#	indra/llmath/v4math.h
#	indra/llui/llfolderviewitem.cpp
#	indra/llui/llfolderviewitem.h
#	indra/llui/llfolderviewmodel.h
#	indra/llui/llmodaldialog.cpp
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltexteditor.h
#	indra/llwindow/llwindowwin32.cpp
#	indra/newview/llagent.cpp
#	indra/newview/llagentcamera.h
#	indra/newview/llavatarrenderinfoaccountant.cpp
#	indra/newview/llconversationmodel.h
#	indra/newview/llfloaterinventorysettings.cpp
#	indra/newview/llfloaternamedesc.cpp
#	indra/newview/llfloaternamedesc.h
#	indra/newview/llfloaterobjectweights.cpp
#	indra/newview/llfloaterobjectweights.h
#	indra/newview/llfolderviewmodelinventory.h
#	indra/newview/llinspecttexture.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventorygallery.h
#	indra/newview/llinventorygallerymenu.cpp
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llinventorypanel.h
#	indra/newview/llmaterialeditor.cpp
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/lloutfitgallery.h
#	indra/newview/lloutfitslist.cpp
#	indra/newview/lloutfitslist.h
#	indra/newview/llpanelgroupcreate.cpp
#	indra/newview/llpanelgroupgeneral.cpp
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpaneloutfitsinventory.h
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelwearing.cpp
#	indra/newview/llreflectionmap.cpp
#	indra/newview/llselectmgr.cpp
#	indra/newview/llsidepanelappearance.cpp
#	indra/newview/llsidepaneliteminfo.cpp
#	indra/newview/llteleporthistorystorage.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturectrl.h
#	indra/newview/lltexturefetch.cpp
#	indra/newview/lltexturefetch.h
#	indra/newview/llviewerassetupload.cpp
#	indra/newview/llviewercamera.cpp
#	indra/newview/llviewercamera.h
#	indra/newview/llviewermenufile.cpp
#	indra/newview/llviewerobject.h
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvoavatar.h
#	indra/newview/llvoavatarself.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/llvovolume.h
#	indra/newview/tests/llviewerassetstats_test.cpp
2025-04-10 06:01:50 +03:00
Andrey Kleshchev 0114be2c15 viewer#2985 Odd crash when notifying voice observers
Crash points at enableDisableCallBtn, but button's floater was cleaned
earlier and has a removeObserver call so an observer record should be
long gone. Likely something else is going on.
Went over various callbacks and made sure they are cleaned. But in case
floater somehow remained, added mSession = nullptr.
2024-11-01 17:54:05 +02:00
Alexander Gavriliuk f7bb097247 #2325 WebRTC: p2p voice calling option sometimes becomes disabled after calling another agent back too soon 2024-08-22 17:18:42 +02:00
Brad Linden 5f26ba8014 Merge remote-tracking branch 'origin/release/webrtc-voice' into release/2024.06-atlasaurus
# Conflicts:
 #	indra/newview/llpanelpeople.cpp
2024-08-15 09:41:54 -07:00
Andrey Kleshchev ab86e77818 viewer-private#260 The 'Speak' button looks disabled during IM voice chat
p2p channels was reusing obsolete channel info
2024-08-14 00:44:39 +03:00
Andrey Kleshchev e086437f12 viewer-private#262 webrtc crashes on shutdown
removeObserver failed to remove an im session floater
2024-08-13 19:30:17 +03:00
Brad Linden 3b2c32fdf9 Merge remote-tracking branch 'origin/release/webrtc-voice' into release/2024.06-atlasaurus
# Conflicts:
 #	.github/workflows/build.yaml
 #	indra/newview/CMakeLists.txt
 #	indra/newview/llspeakers.cpp
 #	indra/newview/llvoicechannel.cpp
 #	indra/newview/llvoicechannel.h
 #	indra/newview/llvoiceclient.cpp
 #	indra/newview/llvoiceclient.h
 #	indra/newview/llvoicewebrtc.cpp
2024-08-09 15:10:13 -07:00
Andrey Kleshchev 9094d0281d Adjust some LLVoiceClient functions
Feels like I should have made isParticipant and getParticipantList
static to minimize singleton dependency/calls
2024-08-07 14:19:49 +03:00
Brad Linden 002be0f243 Merge remote-tracking branch 'origin/release/webrtc-voice' into release/2024.06-atlasaurus 2024-08-01 15:40:41 -07:00
Andrey Kleshchev f75735d741 viewer-private#255 p2p outgoing calls did not work correctly #2 2024-07-30 07:31:05 +03:00
Andrey Kleshchev 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
Brad Linden 3e4b23539c Merge remote-tracking branch 'origin/release/webrtc-voice' into release/2024.06-atlasaurus
# Conflicts:
 #	autobuild.xml
 #	indra/newview/llvoicechannel.cpp
2024-07-17 14:35:17 -07:00
Roxie Linden 0f2bb1bd83 Make the webrtc viewer work for vivox adhoc/group calls.
There was an issue on the release grid where old-style credentials
were being sent over and the webrtc viewer wasn't dealing with them properly.
2024-06-26 12:53:49 -07:00
Ansariel e2c7a4d245 Fix some BOOL oversights during WebRTC merge 2024-06-21 19:48:18 +02:00
Roxie Linden 5e60392c27 Merge branch 'develop' of github.com:secondlife/viewer into roxie/webrtc-voice 2024-06-13 14:59:28 -07:00
Andrey Kleshchev 9e584ed41b viewer-private#244 Reconnect to voice after 'tuning'
activate() does nothing if call already started
2024-06-05 22:08:41 +03:00
Ansariel e2e37cced8 Fix line endlings 2024-05-22 22:40:26 +03:00
Ansariel 1b67dd855c Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A
# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llimpanel.cpp
#	indra/newview/llimpanel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp
2024-05-22 19:04:52 +02:00
Roxie Linden 3a212d9608 Merge branch 'spaces-merge' into roxie/webrtc-voice 2024-05-20 12:59:59 -07: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 57182b2ac0 tabbing 2024-04-28 19:39:23 -07:00
Roxie Linden 4c4d23acb0 Renegotiate voice if the voice server type has changed.
The server will send an update with new voice credentials
when another peer comes in requiring vivox, if the channel
was initially webrtc.
2024-04-26 21:31:06 -07:00
Roxie Linden b59ff9edc0 For p2p/adhoc/group calls, prefer voice server type based on what's running on the region 2024-04-19 18:52:32 -07: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 e5a7c9cc4e some comments; allow proximal channel to retry when it drops 2024-03-13 11:36:21 -07:00
Roxie Linden 1f177d837c fixup tabs 2024-03-11 14:41:12 -07:00
Roxie Linden 041946455d Send down preferred voice server type when initiating a call 2024-03-07 15:00:04 -08:00
Roxie Linden 967534352b more p2p logic fixes 2024-03-05 20:55:13 -08:00
Roxie Linden 70044b9d2b The response from the provision account call was being called twice for some reason 2024-03-05 18:57:22 -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
Ansariel 60d3dd98a4 Convert remaining BOOL to bool 2024-02-21 23:14:31 +02:00
Roxie Linden d0cf247c2a P2P checkpoint 2024-02-08 18:37:09 -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
Andrey Kleshchev b6c7eee505 SL-16320 Remove references to AvaLine from the viewer 2021-11-05 21:01:45 +02:00
andreykproductengine da4d270695 MAINT-8959 Fixed some pointers not being reset 2018-08-07 17:23:27 +03:00
Oz Linden 52926f72ea VOICE-46: allow longer connection timeout, with fewer retries. Clarify ports needed. Remove pointless in-progress notice 2017-02-27 12:46:07 -05:00
Oz Linden 9be58e915a merge with 4.0.3-release 2016-04-04 15:53:09 -04:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Rider Linden 75c6549fde Set consistent terminology for yield/wait -> suspend for coroutines. 2015-09-18 11:39:22 -07:00
Nat Goodspeed efa9a0f99c Backed out changeset bab1000e1b2d: restore 'selfless' changes 2015-07-10 19:30:10 -04:00
Rider Linden 247eb0c9c3 Backout selfles merge 738255dbbfd679d9e615baab3398e5e345bbb3c5 2015-07-07 19:41:27 +01:00
Nat Goodspeed b262ded7e0 MAINT-5351: Remove 'self' parameter from coroutine functions.
lleventcoro_test.cpp runs clean (as modified for new API), and all the rest
builds clean, but the resulting viewer is as yet untested.
2015-07-01 18:33:29 -04:00
Rider Linden 0d3fb07bfa Remove vestigial httpclient.h include from files that no longer need it. 2015-06-03 16:04:40 -07:00
Rider Linden a4741cecb2 Changed Avatar picker to use coroutine for find.
Fixed a stray reference (&) on URL that had crept into some coroutine definitions.
2015-05-18 16:18:07 -07:00
Rider Linden 4fc12def1e Group voice chat coro 2015-05-15 15:04:28 -07:00
Mnikolenko ProductEngine 6efd9d09b9 MAINT-2699 FIXED Disable voice and release mic button when status is changed to STATUS_VOICE_DISABLED. 2014-09-01 11:33:55 +03:00