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
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
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
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
60d3dd98a4
Convert remaining BOOL to bool
2024-02-21 23:14:31 +02:00
c285f59ce2
Replace BOOL with bool in llwindow and dependent classes
2024-02-18 15:51:54 +02:00
d561756d58
SL-14497 Unblocking does not remove voice block
2020-12-08 23:25:34 +02:00
4543d5d5cc
SL-12062 FIXED The 'voice volume' slider in IM does not change the personal volume of user
2019-10-08 18:33:10 +03:00
bce1630e26
SL-10780 FIXED Speaker icon is shown for all friends
2019-03-22 17:31:26 +02:00
3b3e4833ad
SL-10686 Refresh indicators on session change, fix visibility
2019-03-05 20:14:21 +02:00
3a8053eb9f
SL-10351 Fixed Avatars muted by Group moderator become Blocked forever
2019-02-11 19:01:28 +02:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
31e5465158
CHUI-788 FIXED Mute icon not shown in participant list in conversation floater
2013-02-27 01:35:27 +02:00
68b61bdec6
CHUI-520: Now when have a P2P conversation torn off a voice indicator icon will be displayed allowing the user to adjust the voice volume when clicked. Also did a code cleanup on conversationview.h/cpp which was showing the speaking indicator icon too soon when joining another voice session. This was due to calling switchIndicator(..) directly inside ::onCurrentVoiceSessionChanged. The proper solution is to wait for SpeeakingIndicatorManager::switchSpeakerIndicators() call switchIndicators().
2012-12-14 16:01:14 -08:00
37e95e8379
CHUI-545: Minor logic fix, inside ::switchIndicator(), make sure that in the case that the parent is visible and the parent makes the visibility changes...that mIndicatorToggled becomes false because the parent has already made the visiblity changes.
2012-12-12 17:43:15 -08:00
89671fa1ad
CHUI-545: Adjusted fix because the old implementation of ::switchIndicator was not very clean and relied on the visiblity of the OutputMonitorCtrl to have a visibility of true even when it wasn't. The fix implemented makes it so that the visibility of OutputMonitorCtrl is always correct and the parent of this ctrl can use this information to adjust children adjacent to OutputMonitorCtrl.
2012-12-12 16:59:57 -08:00
34558181c7
CHUI-545: Problem: Sometimes the speaker indicator icons were not visible in the conversations panel. Resolution: The problem was that the visibility was set incorrectly. When the speaking indicator was not in the visible chain the state of the visiblity would be stored in a pending variable. If the visiblity changed before the pending variable was used, then this meant the pending variable overrode the most recent visibiltiy changes. So as a solution, if the visiblity changes then prevent the pending visiblity from being used.
2012-12-11 17:49:43 -08:00
2d25eb18ad
CHUI-479 : Clean up unecessary tracking code
2012-11-17 13:24:41 -08:00
ec5d1e48c4
CHUI-479 : WIP : Introduce a publicly available LLSpeakingIndicatorManager::updateSpeakingIndicators() method so to reset all indicators when creating new dialogs.
2012-11-15 18:07:57 -08:00
bd62d1d337
CHUI-479 : WIP : More tracing
2012-11-14 20:00:01 -08:00
33068c6da8
CHUI-479 : WIP : Add debug tracing into speaking indicator manager and monitors (to be deleted eventually).
2012-11-14 10:40:51 -08:00
3e3735c16b
CHUI-345 ADDITIONAL FIX (LLConversationViewSession: enable speaking indicator)
...
- Clicking on the conversation speaking icon brings up the volume floater for voice conversations
2012-09-28 15:02:31 +03:00
f7f15900ea
CHUI-346 ADDITIONAL FIX (LLConversationViewSession: enable current voice channel indicator)
...
- When voice initialized show voice channel indicator for nearby chat session
2012-09-27 17:46:11 +03:00
30ea133818
CHUI-344 : Fix Mac build issue introduced by previous fix attempt
2012-09-26 17:30:52 -07:00
976a2f5a44
CHUI-344 FIXED (LLConversationViewSession: enable icon update)
...
- This commit also fixes CHUI-345 CHUI-346
2012-09-26 20:45:18 +03:00
7996857500
CHUI-80 FIXED Implemented volume indicator pop-up.
...
It is invoked by clicking on any speaking indicator except yours.
2012-04-12 00:43:37 +03:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
658ccc3e85
Re-insert backed out SLE checkin so we can fix it
2010-04-07 11:08:04 -07:00
0bb3f144c0
Backed out changeset 63b699f90efd
2010-04-07 10:37:07 +01:00
b11a625e6f
Automated merge with a few fixups for code review comments
2010-03-01 15:31:04 -08:00
a2efe4bb41
automated merge
2010-02-26 19:18:15 -08:00
2d7697dfad
automated merge
2010-02-26 01:52:28 -08:00
6bb43e1369
Automated merge up from viewer 2.0 trunk.
...
Some llvoiceclient changes duplicated changes that had already been
made in the voice modularization refactor, so the refactor versions
were used.
2010-02-24 17:04:48 -08:00
2ad421cef6
Work on major bug EXT-5562 (Misleading Active Voice Indicators in Group Chat Window, when Speakers are in Spatial Chat Only)
...
Completed
-- code improvements: updated condition to store really switched on indicators for future switching off.
--HG--
branch : product-engine
2010-02-24 11:53:10 +02:00
2fc5956d9d
Work on major bug EXT-5562 (Misleading Active Voice Indicators in Group Chat Window, when Speakers are in Spatial Chat Only)
...
-- added more log information
-- session uuid can now be set only from SpeakingIndicatorManager to ensure target session is the same indicator was registered with.
-- comments cleanup
--HG--
branch : product-engine
2010-02-24 11:13:52 +02:00
022c433d53
Work on major bug EXT-5562 (Misleading Active Voice Indicators in Group Chat Window, when Speakers are in Spatial Chat Only)
...
- implemented passing of target session UUID for which registered indicator should be shown only.
--HG--
branch : product-engine
2010-02-24 10:59:52 +02:00
d5a0fd7997
Work on major bug EXT-5562 (Misleading Active Voice Indicators in Group Chat Window, when Speakers are in Spatial Chat Only)
...
- updated interfaces of LLSpeakingIndicatorManager::registerSpeakingIndicator & LLOutputMonitorCtrl::setSpeakerId
to take a target session id for which registered indicator should be shown.
--HG--
branch : product-engine
2010-02-23 13:20:43 +02:00
20e9e6b57e
Fixed normal bug EXT-4907 - Two voice indicators are displayed in chiclets bar after making second
...
voice call
--HG--
branch : product-engine
2010-02-05 11:46:34 +02:00
d5e97617c6
Fixed major bug EXT-4782 (Viewer crashes if end ad-hoc voice chat by 'End session' context commant of chiclet)
...
- reason: indicator on ad-hoc chiclets is changed its speaker UUID that leads to registering the same instances several times in the SpeakingIndicatorManager.
This leads to crash after instance is destroyed because the only one (specified by UUID in unregisterSpeakingIndicator()) is removed from the map.
So, using stored deleted pointer leads to crash. See EXT-4782.
- fix: prevent regestering the same instance of indicator by removing existing one in LLOutputMonitorCtrl::setSpeakerId.
Also added check in SpeakingIndicatorManager to prevent such situation in the future with an appropriate warning & assert.
--HG--
branch : product-engine
2010-02-01 17:48:25 +02:00
2029bf92e2
Work on major bug EXT-3976 (Voice chat speaking indicators should only display when users are in the same voice channel)
...
-- improvements: added more comment for LLOutputMonitorCtrl::switchIndicator
--HG--
branch : product-engine
2010-01-14 17:35:57 +02:00
44e1f34f96
Work on major bug EXT-3976 (Voice chat speaking indicators should only display when users are in the same voice channel)
...
-- refactoring: implemented processing of switching indicator on/off in the same way
--HG--
branch : product-engine
2010-01-14 17:29:56 +02:00
f606a5b300
Work on major bug EXT-3976 (Voice chat speaking indicators should only display when users are in the same voice channel)
...
-- fixed bug: "Indicator does not appear if two indicators are visible for the same avatar on second switching to the same voice channel"
--HG--
branch : product-engine
2010-01-14 17:14:43 +02:00
86769b40aa
Work on major bug EXT-3976 (Voice chat speaking indicators should only display when users are in the same voice channel)
...
-- implemented functionality to have voice indicator visible only for avatars in the same voice channel with agent
All speacking indicators should be registered in LLSpeakingIndicatorManager to be provcessed for the voice channel.
They should implement switchIndicator(bool) as reaction on voice state changing
--HG--
branch : product-engine
2010-01-14 16:48:06 +02:00
a9634391d9
Moved parameters to xml so they don't overwrite outputmonitor's parameters in default widgets.
...
--HG--
branch : product-engine
2009-12-26 17:06:59 +02:00
08c5a509d3
Fixed normal bug EXT-3542 (Avatar blocked "by text" looks confusing)
...
-- implemented reaction of Speaker indicator only on voice blocking
--HG--
branch : product-engine
2009-12-17 19:06:21 +02:00
08f1e05552
fixed major bug EXT-1984 Speak button light should not disable when voice channel is open
...
--HG--
branch : product-engine
2009-11-02 21:51:39 +02:00
20e56a6925
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1992 https://svn.aws.productengine.com/secondlife/pe/stable-2@2004 -> viewer-2.0.0-3
...
* Bugs: EXT-1091 EXT-1418 EXT-996 EXT-1150 EXT-1188 EXT-1417 EXT-1181 EXT-1058 EXT-1397 EXT-836 EXT-1437 EXT-1379
* Dev: EXT-1291 EXT-1255 EXT-992 EXT-96 EXT-1157
2009-10-13 16:25:48 +00:00
1713a3552b
merge -r 1879-1884 https://svn.aws.productengine.com/secondlife/pe/stable-2
...
* Major Bugs: EXT-1248 EXT-1127 EXT-844 EXT-1160
* Changes: EXT-1139 (places context menu)
2009-10-01 17:52:30 +00:00
Brad Linden