Age | Commit message (Collapse) | Author |
|
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.
|
|
|
|
|
|
|
|
removed obsolete code and fine tuned voice state machine to avoid frequent
neccessary code paths.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
dependencies
|
|
|
|
|
|
needed to synchronize both buttons
|
|
open the mic.
Also hoisted PTT key handling from LLVivoxVoiceClient up to LLVoiceClient. This cleans up LLVoiceModuleInterface a bit and makes the PTT logic more centralized.
Reviewed by Richard.
|
|
|
|
|
|
|
|
|
|
Separate Play and Stop callbacks, to allow single click previews in the effect list.
|
|
the Voice Effects preview is opened.
Disconnecting from voice on hitting record was taking too long and causing the start of the voice recording to be cut off.
|
|
|
|
client.
|
|
|
|
Created LLVoiceEffectInterface as an optional interface to be implemented by voice modules that support voice effects.
|
|
Also simplified LLPanelVoiceFont some.
|
|
|
|
|
|
|
|
|
|
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.
|
|
|
|
|
|
they are not guaranteed unique across sessions.
Replaced all references to "Font" with "Voice Font" where possible to reduce confusion for anyone grepping code in future.
|
|
DEV-48903 - malformed names in p2p dialogs for Diamondware
In the merge there were some changes that didn't get propagated that resulted in some failures with
respect to diamondware name processing. THe determination as to whether a p2p session was with
an avatar or with an alcatel (pbx) wasn't propagated into the diamondware code.
I fixed that by merging the changes to the vivox module with respect to that into the diamondware module.
Also, the acceptance dialog was vanishing too quickly as the determination as to whether there was still
a p2p invite pending was not updated when the calling code was updated.
The calling code initially was changed to look into vivox state which isn't really valid. that was changed in
the 'trunk' to another mechanism, but that still assumed visibility into the voice code.
I fixed that by creating an API call to ask whether a call was pending.
CR: Karina
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This makes sure we have the voice font list before attempting to start a session.
|
|
|
|
LLVoiceClient::voiceWorking() in general to clear things up a bit.
--HG--
branch : product-engine
|
|
disabled) and EXT-4313
(Should not be able to start a call when voice is disabled). Call buttons state now reacts on
voice changes in time.
- Added voiceWorking() method to LLVoiceClient to determine real availability of voice, because voiceEnabled()
doesn't take into account possible errors. Perhaps there is no need in two methods- some investigation will be
made and depending on its results they may become one non-static method. voiceWorking() uses state of voice
client(mState) to determine voice availability. Also some states which are not currently counted by voiceWorking()
as valid may be added if testing reveals problems.
- To enable/disable call buttons in time, LLVoiceClientStatusObserver is used. Its trigger uses states from its
enum only to skip updating button in some states(to avoid button blinking), but to determine button state
LLVoiceClient's voiceWorking() is used.
--HG--
branch : product-engine
|
|
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
|
|
--HG--
branch : product-engine
|
|
Resolved conflicts in llalertdialog.h and llnotify.cpp (local deletion vs
remote change) by removing them.
--HG--
branch : product-engine
|
|
This change reverts the code parts of e038c0211968 that relate to the
sound preferences slider. Lis has already re-enabled the slider in the
panel_preferences_sound.xml XUI file.
So the overall change for EXT-3394 is now:
- remove the volume slider from the Voice Controls panel
- make 50 be the default volume level, not 62
|