7e7e19ee35
Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llinventorymodel.h
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvoiceclient.cpp
# indra/newview/pipeline.cpp
2025-02-07 19:38:29 +01:00
1924241f04
viewer-private#375 add more logging in attempt to get more info
2025-02-07 19:00:20 +02:00
8ed4989c34
Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llvoicevivox.cpp
2024-11-07 18:02:38 +01:00
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
64b6587eec
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventoryfilter.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llworldmapview.cpp
# indra/newview/skins/default/xui/en/floater_tools.xml
# indra/newview/skins/default/xui/en/menu_viewer.xml
2024-09-09 19:48:04 +02:00
3017b1bae1
Don't enable vivox spatial when teleporting while in a webrtc conference/p2p/group call
...
Processing for vivox was being enabled when teleporting into a vivox region
regardless as to whether the user was in a conference/p2p/group call, resulting
in vivox spatial and webrtc conference/p2p/group simultaneously being active.
2024-09-06 12:00:00 -07:00
830eeaa6ff
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llagentwearables.cpp
# indra/newview/llface.cpp
# indra/newview/llpanelpeople.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llviewertexturelist.cpp
2024-08-21 00:46:46 +02:00
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
e086437f12
viewer-private#262 webrtc crashes on shutdown
...
removeObserver failed to remove an im session floater
2024-08-13 19:30:17 +03:00
25b7fd4fa9
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-webrtc-voice
...
# 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-10 13:04:14 +02:00
b35e4d26d1
Merge branch 'release/webrtc-voice' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/lleventpoll.cpp
# indra/newview/llvoiceclient.cpp
# indra/newview/llvoicewebrtc.cpp
2024-08-10 12:51:51 +02:00
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
227b212dc6
Teleport to a region with a different voice server type causes failure in voice
...
When teleporting, the viewer 'hides' voice, effectively disabling it, until the teleport
has completed. It does this by instructing the voice module to hide and then unhide.
The problem was, it would instruct one voice module for one voice server type to hide,
and then after teleport, it would instruct the other voice module for the other voice
server type to unhide, resulting in one voice module being hidden.
When the user transitions back to a region with the initial voice module, it's hidden,
hence voice doesn't work.
The solution is to hide/unhide both voice modules.
2024-08-09 12:04:19 -07:00
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
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
002be0f243
Merge remote-tracking branch 'origin/release/webrtc-voice' into release/2024.06-atlasaurus
2024-08-01 15:40:41 -07:00
f75735d741
viewer-private#255 p2p outgoing calls did not work correctly #2
2024-07-30 07:31:05 +03:00
698d8450c0
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-webrtc-voice
2024-07-25 18:37:58 +02:00
035d3506dc
Merge branch 'release/webrtc-voice' of https://github.com/secondlife/viewer
2024-07-25 18:34:11 +02:00
ed73208eb9
Merge remote-tracking branch 'origin/release/webrtc-voice' into release/2024.06-atlasaurus
2024-07-24 16:55:49 -07:00
26a01ced9a
Improve error message notifying user that Voice Morph Effects are not supported
...
secondlife/viewer#1451
2024-07-23 17:32:59 -07:00
cf5bc75d44
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-webrtc-voice
...
# Conflicts:
# indra/newview/llpanelsnapshot.cpp
# indra/newview/llsnapshotlivepreview.cpp
# indra/newview/llspeakers.cpp
# indra/newview/llvoicechannel.cpp
# indra/newview/rlvinventory.cpp
2024-07-18 21:53:13 +02:00
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
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
3c71230aa4
don't set voice font for vivox
2024-07-02 21:03:30 -07:00
af21783ffa
EnableVoiceMorphing should default to true
2024-07-02 13:52:51 -07:00
3eab42ebd8
Disable voice morphing and throw up a warning if it's previously enabled.
2024-06-21 13:22:12 -07:00
e33d2fad5f
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-gltf-development
...
# Conflicts:
# indra/newview/llimview.h
# indra/newview/llpanelpeople.h
# indra/newview/llpanelvoicedevicesettings.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoicechannel.cpp
# indra/newview/llvoicechannel.h
# indra/newview/llvoiceclient.cpp
# indra/newview/llvoiceclient.h
# indra/newview/llvoicevivox.cpp
# indra/newview/llvoicevivox.h
2024-06-21 19:10:44 +02:00
5e60392c27
Merge branch 'develop' of github.com:secondlife/viewer into roxie/webrtc-voice
2024-06-13 14:59:28 -07: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
4b0ad849a9
Merge remote-tracking branch 'LL/project/webrtc-voice'
...
# Conflicts:
# autobuild.xml
# indra/cmake/WebRTC.cmake
2024-05-21 00:42:55 +02:00
3da533c5eb
Merge remote-tracking branch 'LGPL/master'
...
# Conflicts:
# autobuild.xml
2024-05-20 23:46:53 +02:00
3a212d9608
Merge branch 'spaces-merge' into roxie/webrtc-voice
2024-05-20 12:59:59 -07:00
2b275d43fb
Clean up some shutdown code.
2024-05-17 13:27:45 -07:00
cfd358f933
WebRTC clients calling Vivox clients should handle P2P
2024-05-16 13:34:13 -07:00
0ecfbc3de9
Merge remote-tracking branch 'LGPL/master'
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llappearance/llwearable.cpp
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llmessage/tests/llmockhttpclient.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.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/llgroupactions.cpp
# indra/newview/llimpanel.cpp
# 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/llpaneleditwearable.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# 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/llviewermenu.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
2024-05-16 14:10:55 +02:00
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
c628c1f6e4
Fix some session shutdown/error handling code
2024-05-08 14:22:43 -07:00
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
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
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
1a1af1ce29
Adjust logic for determine what voice server type to use.
2024-04-20 00:26:39 -07:00
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
Ansariel