ac75cd98fc
Fix null region pointer crash in LLIMView
2024-08-09 22:55:08 +03:00
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
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
454821bb59
#1806 - crash in initVoiceChannel
2024-06-25 18:30:18 -07:00
e2c7a4d245
Fix some BOOL oversights during WebRTC merge
2024-06-21 19:48:18 +02:00
5e60392c27
Merge branch 'develop' of github.com:secondlife/viewer into roxie/webrtc-voice
2024-06-13 14:59:28 -07:00
9e45c1e506
Fix issues resulting from b42f9d836b
2024-06-09 16:17:03 +02:00
b42f9d836b
Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings
2024-06-01 15:49:26 +02:00
e2e37cced8
Fix line endlings
2024-05-22 22:40:26 +03:00
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
3a212d9608
Merge branch 'spaces-merge' into roxie/webrtc-voice
2024-05-20 12:59:59 -07:00
ddbd1ab47e
More session shutdown cleanup
2024-05-19 02:30:45 -07:00
cfd358f933
WebRTC clients calling Vivox clients should handle P2P
2024-05-16 13:34:13 -07:00
57b99aec74
Don't overwrite voice channel's credentials when retrieving the channel.
2024-05-13 18:40:00 -07:00
39d24e90b9
incoming p2p sessions for webrtc may not have names yet.
2024-05-13 12:36:07 -07:00
27e4913b5c
Fix issue where groups/adhoc chats were named with the initiators display name
2024-05-10 09:36:38 -07:00
f9473e8afc
secondlife/viewer#1333 BOOL to bool conversion leftovers: ternaries
2024-05-07 10:18:51 +02:00
4af9128db1
Merge branch 'main' of https://github.com/secondlife/viewer into roxie/webrtc-voice
2024-05-06 16:40:12 -07:00
38c2a5bde9
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
2024-05-01 08:16:58 +03:00
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
57182b2ac0
tabbing
2024-04-28 19:39:23 -07:00
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
85f2447b3d
Merge branch 'main' into marchcat/a-merge
...
# Conflicts:
# autobuild.xml
# indra/llimage/llimage.cpp
# indra/llui/llsearcheditor.cpp
# indra/llui/llview.cpp
# indra/newview/llagent.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloatercamera.cpp
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpanelgroupbulkban.cpp
# indra/newview/llsidepanelappearance.cpp
# indra/newview/llvovolume.cpp
2024-04-24 19:28:15 +03:00
428f21cf79
Merge branch 'main' into marchcat/x-merge
2024-04-24 18:45:54 +03:00
1a1af1ce29
Adjust logic for determine what voice server type to use.
2024-04-20 00:26:39 -07:00
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
648741470f
CR suggestions
2024-04-07 19:23:00 -07:00
4be63d8c1f
missed a file
2024-04-07 14:16:07 -07:00
4ecf050439
Tell the user the peer has declined and shut down voice channel
...
When the server sends up a notification that a peer is not doing
voice in adhoc-style p2p chat, shut down the voice call and
notify the user the peer has declined.
2024-04-06 21:58:17 -07:00
b6f4cec7d5
checkpoint p2p im decline/accept work
2024-04-04 16:13:33 -07:00
3ff1f0f951
An explicit "decline" message for P2P
...
When declining a P2P voice call for webrtc, instead of relying
on vivox to stop "ringing," we need to send an explicit decline
message from the peer through the server infrastructure.
2024-04-04 11:32:51 -07:00
e5a7c9cc4e
some comments; allow proximal channel to retry when it drops
2024-03-13 11:36:21 -07:00
1f177d837c
fixup tabs
2024-03-11 14:41:12 -07:00
425f089ffc
addSession had a changed parameter...which wasn't changed everywhere
2024-03-07 19:30:32 -08:00
28032582f2
Shutting down a p2p via adhoc call resets the channel info. We shouldn't throw up a blank dialogue when that happens
2024-03-06 11:17:54 -08:00
967534352b
more p2p logic fixes
2024-03-05 20:55:13 -08:00
2c2529d3c8
Notify join on connect instead of on first peer join, for adhoc-p2p incoming calls
2024-03-05 11:48:56 -08:00
6d5304bd92
For webrtc, 'calling' dialog should remain up, disappearing when peer connects (p2p)
2024-03-05 11:05:31 -08:00
f4c1e2e795
Pass invitation type (p2p/group/adhoc) around
2024-03-04 15:23:20 -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
60d3dd98a4
Convert remaining BOOL to bool
2024-02-21 23:14:31 +02:00
a5261a5fa8
Convert BOOL to bool in llui
2024-02-21 03:00:25 +02:00
4419bb8709
more misc: BOOL (int) to real bool
2024-02-12 23:17:22 +02:00
70068a244b
Fix ad-hoc voice
2024-02-09 13:13:44 -08:00
41054efc24
Add new P@P multiagentchat handler for webrtc voice
2024-02-08 18:37:10 -08:00
d0cf247c2a
P2P checkpoint
2024-02-08 18:37:09 -08:00
ecd6b87b19
checkpoint p2p/adhoc voice
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
5c412a2b70
SL-20798 use appropriate check
2024-01-11 20:46:07 +02:00
Rye Mutt