Commit Graph

43 Commits (431b3b0c6dc4e5ab07ff3cefd9b21de5580f6902)

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 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
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 e086437f12 viewer-private#262 webrtc crashes on shutdown
removeObserver failed to remove an im session floater
2024-08-13 19:30:17 +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
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
Ansariel eb1ed3896f Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A
# Conflicts:
#	autobuild.xml
#	indra/llrender/llfontbitmapcache.cpp
#	indra/llrender/llfontbitmapcache.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llrender/llfontfreetype.h
#	indra/llrender/llfontgl.cpp
#	indra/llrender/llfontgl.h
#	indra/llui/llbutton.h
#	indra/llui/llfloater.cpp
#	indra/llui/llfloater.h
#	indra/llui/llfolderviewitem.cpp
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/llscrollcontainer.cpp
#	indra/llui/llscrollingpanellist.cpp
#	indra/llui/llscrollingpanellist.h
#	indra/llui/llscrolllistctrl.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltexteditor.h
#	indra/llui/lluictrl.cpp
#	indra/llui/llview.cpp
#	indra/llui/llview.h
#	indra/newview/llchicletbar.h
#	indra/newview/llconversationlog.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterimsessiontab.h
#	indra/newview/llfloateruipreview.cpp
#	indra/newview/llnavigationbar.h
#	indra/newview/llpaneltopinfobar.h
#	indra/newview/llpathfindingpathtool.h
#	indra/newview/lltextureview.cpp
#	indra/newview/lltoolbrush.h
#	indra/newview/lltoolcomp.h
#	indra/newview/lltooldraganddrop.h
#	indra/newview/lltoolface.h
#	indra/newview/lltoolfocus.h
#	indra/newview/lltoolindividual.h
#	indra/newview/lltoolobjpicker.h
#	indra/newview/lltoolpie.h
#	indra/newview/lltoolpipette.h
#	indra/newview/lltoolselectland.h
#	indra/newview/llviewermediafocus.h
#	indra/newview/llviewerparcelmediaautoplay.h
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvoicechannel.h
#	indra/newview/llvoicevivox.h
#	indra/newview/llworldmapview.cpp
2024-03-12 16:52:30 +01:00
Ansariel 60d3dd98a4 Convert remaining BOOL to bool 2024-02-21 23:14:31 +02:00
Callum Prentice abdb4941cf DRTVWR-489: Clean up a new warning-as-error failure on macOS 2023-03-07 14:49:57 -08:00
Callum Prentice 547c0665ea DRTVWR-489-emoji: As part of the work to get macOS version of the Viewer working, the flag was introduced to warn (and therefore error out) when a virtual override was not marked with the 'override' keyword. Fixing this up involved a large number of changes and this commit represents just those changes - nothing specially from the DRTVWR-489 viewer
(Cherry pick of 3 commits from Callum to declutter the emoji PR: 3185bdea27,
923733e591 and 6f31fabbc2)
2023-02-14 17:01:22 +01:00
akleshchev f7010e46af
SL-18778 Crash at LLVoiceClient::removeObserver (#25) 2022-12-06 04:37:07 +02:00
Nat Goodspeed d2c3c2f9fe MAINT-5232: Normalize LLSingleton subclasses.
A shocking number of LLSingleton subclasses had public constructors -- and in
several instances, were being explicitly instantiated independently of the
LLSingleton machinery. This breaks the new LLSingleton dependency-tracking
machinery. It seems only fair that if you say you want an LLSingleton, there
should only be ONE INSTANCE!

Introduce LLSINGLETON() and LLSINGLETON_EMPTY_CTOR() macros. These handle the
friend class LLSingleton<whatevah>;
and explicitly declare a private nullary constructor.

To try to enforce the LLSINGLETON() convention, introduce a new pure virtual
LLSingleton method you_must_use_LLSINGLETON_macro() which is, as you might
suspect, defined by the macro. If you declare an LLSingleton subclass without
using LLSINGLETON() or LLSINGLETON_EMPTY_CTOR() in the class body, you can't
instantiate the subclass for lack of a you_must_use_LLSINGLETON_macro()
implementation -- which will hopefully remind the coder.

Trawl through ALL LLSingleton subclass definitions, sprinkling in
LLSINGLETON() or LLSINGLETON_EMPTY_CTOR() as appropriate. Remove all explicit
constructor declarations, public or private, along with relevant 'friend class
LLSingleton<myself>' declarations. Where destructors are declared, move them
into private section as well. Where the constructor was inline but nontrivial,
move out of class body.

Fix several LLSingleton abuses revealed by making ctors/dtors private:

LLGlobalEconomy was both an LLSingleton and the base class for
LLRegionEconomy, a non-LLSingleton. (Therefore every LLRegionEconomy instance
contained another instance of the LLGlobalEconomy "singleton.") Extract
LLBaseEconomy; LLGlobalEconomy is now a trivial subclass of that.
LLRegionEconomy, as you might suspect, now derives from LLBaseEconomy.

LLToolGrab, an LLSingleton, was also explicitly instantiated by
LLToolCompGun's constructor. Extract LLToolGrabBase, explicitly instantiated,
with trivial subclass LLToolGrab, the LLSingleton instance.

(WARNING: LLToolGrabBase methods have an unnerving tendency to go after
LLToolGrab::getInstance(). I DO NOT KNOW what should be the relationship
between the instance in LLToolCompGun and the LLToolGrab singleton instance.)

LLGridManager declared a variant constructor accepting (const std::string&),
with the comment:
// initialize with an explicity grid file for testing.
As there is no evidence of this being called from anywhere, delete it.

LLChicletBar's constructor accepted an optional (const LLSD&). As the LLSD
parameter wasn't used, and as there is no evidence of it being passed from
anywhere, delete the parameter.

LLViewerWindow::shutdownViews() was checking LLNavigationBar::
instanceExists(), then deleting its getInstance() pointer -- leaving a
dangling LLSingleton instance pointer, a land mine if any subsequent code
should attempt to reference it. Use deleteSingleton() instead.

~LLAppViewer() was calling LLViewerEventRecorder::instance() and then
explicitly calling ~LLViewerEventRecorder() on that instance -- leaving the
LLSingleton instance pointer pointing to an allocated-but-destroyed instance.
Use deleteSingleton() instead.
2016-09-15 20:18:12 -04:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
mberezhnoy 651f230500 CHUI-678 (Voice indicators not shown for participants in torn off conference conversations) 2013-01-23 10:23:16 +02:00
Merov Linden 2d25eb18ad CHUI-479 : Clean up unecessary tracking code 2012-11-17 13:24:41 -08:00
Merov Linden 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
Merov Linden bd62d1d337 CHUI-479 : WIP : More tracing 2012-11-14 20:00:01 -08:00
Merov Linden 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
Gilbert Gonzales a9f8b94551 CHUI-363: Problem: Nearby chat is a set to be a null converstation. Because of this, when the voice indicator was set to only show for active conversations...voice indicators inside null conversations were not being turned toggled. Resolution: Now will adjust the speaker indicator even if it exists in a null (nearby chat) conversation. 2012-10-24 10:51:29 -07:00
Mark Palange (Mani) c893c55d8a Fixing bugs discovered in merge with viewer development 2010-11-18 17:03:01 -08:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Aimee Linden 9cec4bdd69 EXT-7138 WIP Merged Voice fonts work into the newly modularized LLVoiceClient.
Created LLVoiceEffectInterface as an optional interface to be implemented by voice modules that support voice effects.
2010-05-13 13:30:28 +01:00
Aimee Linden cacfa18643 Persist Voice Font selection.
Added 'VoiceFontDefault' saved setting.
Implemented LLVoiceClientFontsObserver to update the UI when the voice font list is received.
Renamed LLVoiceClientParticipantObserver::onChange() to onParticipantsChanged to avoid ambiguity and make the code more readable.
Made the Voice Font combo in the VCP auto resize to make best use of the available space when the 'Leave Call button is not visible.
2010-04-28 03:33:15 +01:00
Roxie Linden 658ccc3e85 Re-insert backed out SLE checkin so we can fix it 2010-04-07 11:08:04 -07:00
Tofu Linden 0bb3f144c0 Backed out changeset 63b699f90efd 2010-04-07 10:37:07 +01:00
Roxie Linden b11a625e6f Automated merge with a few fixups for code review comments 2010-03-01 15:31:04 -08:00
Roxie Linden 2d7697dfad automated merge 2010-02-26 01:52:28 -08:00
Roxie Linden 92cef0426d automated merge from trunk 2010-02-25 11:33:56 -08:00
Roxie Linden c6163fafaa automated merge 2010-02-25 01:34:52 -08:00
Roxie Linden 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
Mike Antipov 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
Mike Antipov 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
Mike Antipov 1f8fb3f3ba Work on major bug EXT-5562 (Misleading Active Voice Indicators in Group Chat Window, when Speakers are in Spatial Chat Only)
- updated code to store target session id for which registered indicator should be shown and process it while switching indicators on.

--HG--
branch : product-engine
2010-02-23 15:33:10 +02:00
Mike Antipov 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
Mike Antipov 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
Mike Antipov d970835f41 Fixed magor bug EXT-3889 (Group IM window voice icons do not show who has joined the group voice call)
- processing agent's speaking indicators in avatar lists in the same way as others (if voice is disabled indicators are invisible)

--HG--
branch : product-engine
2010-01-20 15:26:29 +02:00
Mike Antipov eb12963eec Related to EXT-3976 (Voice chat speaking indicators should only display when users are in the same voice channel)
-- cleanup: remove logging of unnecessary warning messages if there are no any registered speaking indicators for voice participant

--HG--
branch : product-engine
2010-01-15 11:48:06 +02:00
Mike Antipov 3c9d99b3b0 Work on major bug EXT-3976 (Voice chat speaking indicators should only display when users are in the same voice channel)
-- cleanup: fixed line endings

--HG--
branch : product-engine
2010-01-14 18:49:36 +02:00
Mike Antipov fc633fce71 Work on major bug EXT-3976 (Voice chat speaking indicators should only display when users are in the same voice channel)
-- improvements: replace std::vector with std::set to avoid duplicated speaker UUIDs. Added method to get a set of voice participants UUIDs

--HG--
branch : product-engine
2010-01-14 18:24:38 +02:00
Mike Antipov 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