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

1 files changed, 363 insertions, 363 deletions

diff --git a/indra/newview/lloutputmonitorctrl.cpp b/indra/newview/lloutputmonitorctrl.cpp
index f171b48ba2..c8b6fd5871 100644
--- a/indra/newview/lloutputmonitorctrl.cpp
+++ b/indra/newview/lloutputmonitorctrl.cpp
@@ -1,363 +1,363 @@
-/** 
- * @file lloutputmonitorctrl.cpp
- * @brief LLOutputMonitorCtrl base class
- *
- * $LicenseInfo:firstyear=2001&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#include "llviewerprecompiledheaders.h"
-#include "lloutputmonitorctrl.h"
-
-// library includes 
-#include "llfloaterreg.h"
-#include "llui.h"
-
-// viewer includes
-#include "llvoiceclient.h"
-#include "llmutelist.h"
-#include "llagent.h"
-
-// default options set in output_monitor.xml
-static LLDefaultChildRegistry::Register<LLOutputMonitorCtrl> r("output_monitor");
-
-// The defaults will be initialized in the constructor.
-//LLColor4	LLOutputMonitorCtrl::sColorMuted;
-//LLColor4	LLOutputMonitorCtrl::sColorOverdriven;
-//LLColor4	LLOutputMonitorCtrl::sColorNormal;
-LLColor4	LLOutputMonitorCtrl::sColorBound;
-//S32			LLOutputMonitorCtrl::sRectsNumber 		= 0;
-//F32			LLOutputMonitorCtrl::sRectWidthRatio	= 0.f;
-//F32			LLOutputMonitorCtrl::sRectHeightRatio	= 0.f;
-
-LLOutputMonitorCtrl::Params::Params()
-:	draw_border("draw_border"),
-	image_mute("image_mute"),
-	image_off("image_off"),
-	image_on("image_on"),
-	image_level_1("image_level_1"),
-	image_level_2("image_level_2"),
-	image_level_3("image_level_3"),
-	auto_update("auto_update"),
-	speaker_id("speaker_id")
-{
-};
-
-LLOutputMonitorCtrl::LLOutputMonitorCtrl(const LLOutputMonitorCtrl::Params& p)
-:	LLView(p),
-	mPower(0),
-	mImageMute(p.image_mute),
-	mImageOff(p.image_off),
-	mImageOn(p.image_on),
-	mImageLevel1(p.image_level_1),
-	mImageLevel2(p.image_level_2),
-	mImageLevel3(p.image_level_3),
-	mAutoUpdate(p.auto_update),
-	mSpeakerId(p.speaker_id),
-	mIsModeratorMuted(false),
-	mIsAgentControl(false),
-	mIndicatorToggled(false),
-	mShowParticipantsSpeaking(false),
-	mChannelState(INACTIVE_CHANNEL)
-{
-	//static LLUIColor output_monitor_muted_color = LLUIColorTable::instance().getColor("OutputMonitorMutedColor", LLColor4::orange);
-	//static LLUIColor output_monitor_overdriven_color = LLUIColorTable::instance().getColor("OutputMonitorOverdrivenColor", LLColor4::red);
-	//static LLUIColor output_monitor_normal_color = LLUIColorTable::instance().getColor("OutputMonitorNotmalColor", LLColor4::green);
-	static LLUIColor output_monitor_bound_color = LLUIColorTable::instance().getColor("OutputMonitorBoundColor", LLColor4::white);
-	//static LLUICachedControl<S32> output_monitor_rects_number("OutputMonitorRectanglesNumber", 20);
-	//static LLUICachedControl<F32> output_monitor_rect_width_ratio("OutputMonitorRectangleWidthRatio", 0.5f);
-	//static LLUICachedControl<F32> output_monitor_rect_height_ratio("OutputMonitorRectangleHeightRatio", 0.8f);
-
-	// IAN BUG compare to existing pattern where these are members - some will change per-widget and need to be anyway
-	// sent feedback to PE
-	
-	// *TODO: it looks suboptimal to load the defaults every time an output monitor is constructed.
-	//sColorMuted			= output_monitor_muted_color;
-	//sColorOverdriven	= output_monitor_overdriven_color;
-	//sColorNormal		= output_monitor_normal_color;
-	sColorBound			= output_monitor_bound_color;
-	//sRectsNumber		= output_monitor_rects_number;
-	//sRectWidthRatio		= output_monitor_rect_width_ratio;
-	//sRectHeightRatio	= output_monitor_rect_height_ratio;
-
-	mBorder = p.draw_border;
-
-	//with checking mute state
-	setSpeakerId(mSpeakerId);
-}
-
-LLOutputMonitorCtrl::~LLOutputMonitorCtrl()
-{
-	LLMuteList::getInstance()->removeObserver(this);
-	LLSpeakingIndicatorManager::unregisterSpeakingIndicator(mSpeakerId, this);
-}
-
-void LLOutputMonitorCtrl::setPower(F32 val)
-{
-	mPower = llmax(0.f, llmin(1.f, val));
-}
-
-void LLOutputMonitorCtrl::draw()
-{
-	// Copied from llmediaremotectrl.cpp
-	// *TODO: Give the LLOutputMonitorCtrl an agent-id to monitor, then
-	// call directly into LLVoiceClient::getInstance() to ask if that agent-id is muted, is
-	// speaking, and what power.  This avoids duplicating data, which can get
-	// out of sync.
-	const F32 LEVEL_0 = LLVoiceClient::OVERDRIVEN_POWER_LEVEL / 3.f;
-	const F32 LEVEL_1 = LLVoiceClient::OVERDRIVEN_POWER_LEVEL * 2.f / 3.f;
-	const F32 LEVEL_2 = LLVoiceClient::OVERDRIVEN_POWER_LEVEL;
-
-	if (getVisible() && mAutoUpdate && !getIsMuted() && mSpeakerId.notNull())
-	{
-		setPower(LLVoiceClient::getInstance()->getCurrentPower(mSpeakerId));
-		if(mIsAgentControl)
-		{
-			setIsTalking(LLVoiceClient::getInstance()->getUserPTTState());
-		}
-		else
-		{
-			setIsTalking(LLVoiceClient::getInstance()->getIsSpeaking(mSpeakerId));
-		}
-	}
-
-	if ((mPower == 0.f && !mIsTalking) && mShowParticipantsSpeaking)
-	{
-		std::set<LLUUID> participant_uuids;
-		LLVoiceClient::instance().getParticipantList(participant_uuids);
-		std::set<LLUUID>::const_iterator part_it = participant_uuids.begin();
-
-		F32 power = 0;
-		for (; part_it != participant_uuids.end(); ++part_it)
-		{
-			power = LLVoiceClient::instance().getCurrentPower(*part_it);
-			if (power)
-			{
-				mPower = power;
-				break;
-			}
-		}
-	}
-
-	LLPointer<LLUIImage> icon;
-	if (getIsMuted())
-	{
-		icon = mImageMute;
-	}
-	else if (mPower == 0.f && !mIsTalking)
-	{
-		// only show off if PTT is not engaged
-		icon = mImageOff;
-	}
-	else if (mPower < LEVEL_0)
-	{
-		// PTT is on, possibly with quiet background noise
-		icon = mImageOn;
-	}
-	else if (mPower < LEVEL_1)
-	{
-		icon = mImageLevel1;
-	}
-	else if (mPower < LEVEL_2)
-	{
-		icon = mImageLevel2;
-	}
-	else
-	{
-		// overdriven
-		icon = mImageLevel3;
-	}
-
-	if (icon)
-	{
-		icon->draw(0, 0);
-	}
-
-	//
-	// Fill the monitor with a bunch of small rectangles.
-	// The rectangles will be filled with gradient color,
-	// beginning with sColorNormal and ending with sColorOverdriven.
-	// 
-	// *TODO: would using a (partially drawn) pixmap instead be faster?
-	//
-	const int monh		= getRect().getHeight();
-	const int monw		= getRect().getWidth();
-	//int maxrects		= sRectsNumber;
-	//const int period	= llmax(1, monw / maxrects, 0, 0);                    // "1" - min value for the period
-	//const int rectw		= llmax(1, llfloor(period * sRectWidthRatio), 0, 0);  // "1" - min value for the rect's width
-	//const int recth		= llfloor(monh * sRectHeightRatio);
-
-	//if(period == 1 && rectw == 1) //if we have so small control, then "maxrects = monitor's_width - 2*monitor_border's_width
-	//	maxrects = monw-2;
-
-	//const int nrects	= mIsMuted ? maxrects : llfloor(mPower * maxrects); // how many rects to draw?
-	//const int rectbtm	= (monh - recth) / 2;
-	//const int recttop	= rectbtm + recth;
-	//
-	//LLColor4 rect_color;
-	//
-	//for (int i=1, xpos = 0; i <= nrects; i++)
-	//{
-	//	// Calculate color to use for the current rectangle.
-	//	if (mIsMuted)
-	//	{
-	//		rect_color = sColorMuted;
-	//	}
-	//	else
-	//	{
-	//		F32 frac = (mPower * i/nrects) / LLVoiceClient::OVERDRIVEN_POWER_LEVEL;
-	//		// Use overdriven color if the power exceeds overdriven level.
-	//		if (frac > 1.0f)
-	//			frac = 1.0f;
-	//		rect_color = lerp(sColorNormal, sColorOverdriven, frac);
-	//	}
-
-	//	// Draw rectangle filled with the color.
-	//	gl_rect_2d(xpos, recttop, xpos+rectw, rectbtm, rect_color, true);
-	//	xpos += period;
-	//}
-
-	//
-	// Draw bounding box.
-	//
-	if(mBorder)
-		gl_rect_2d(0, monh, monw, 0, sColorBound, false);
-}
-
-// virtual
-bool LLOutputMonitorCtrl::handleMouseUp(S32 x, S32 y, MASK mask)
-{
-	if (mSpeakerId != gAgentID)
-	{
-		LLFloaterReg::showInstance("floater_voice_volume", LLSD().with("avatar_id", mSpeakerId));
-	}
-	else if (mShowParticipantsSpeaking)
-	{
-		LLFloaterReg::showInstance("chat_voice", LLSD());
-	}
-
-	return true;
-}
-
-void LLOutputMonitorCtrl::setIsActiveChannel(bool val)
-{
-    setChannelState(val ? ACTIVE_CHANNEL : INACTIVE_CHANNEL);
-}
-
-void LLOutputMonitorCtrl::setChannelState(EChannelState state)
-{
-    mChannelState = state;
-    if (state == INACTIVE_CHANNEL)
-    {
-        // switchIndicator will set it to true when channel becomes active
-        setVisible(false);
-    }
-}
-
-void LLOutputMonitorCtrl::setSpeakerId(const LLUUID& speaker_id, const LLUUID& session_id/* = LLUUID::null*/, bool show_other_participants_speaking /* = false */)
-{
-	if (speaker_id.isNull() && mSpeakerId.notNull())
-	{
-		LLSpeakingIndicatorManager::unregisterSpeakingIndicator(mSpeakerId, this);
-        switchIndicator(false);
-        mSpeakerId = speaker_id;
-	}
-
-	if (speaker_id.isNull() || (speaker_id == mSpeakerId))
-	{
-		return;
-	}
-
-	if (mSpeakerId.notNull())
-	{
-		// Unregister previous registration to avoid crash. EXT-4782.
-		LLSpeakingIndicatorManager::unregisterSpeakingIndicator(mSpeakerId, this);
-	}
-
-	mShowParticipantsSpeaking = show_other_participants_speaking;
-	mSpeakerId = speaker_id;
-	LLSpeakingIndicatorManager::registerSpeakingIndicator(mSpeakerId, this, session_id);
-
-	//mute management
-	if (mAutoUpdate)
-	{
-		if (speaker_id == gAgentID)
-		{
-			mIsMuted = false;
-		}
-		else
-		{
-			// check only blocking on voice. EXT-3542
-			mIsMuted = LLMuteList::getInstance()->isMuted(mSpeakerId, LLMute::flagVoiceChat);
-			LLMuteList::getInstance()->addObserver(this);
-		}
-	}
-}
-
-void LLOutputMonitorCtrl::onChangeDetailed(const LLMute& mute)
-{
-    if (mute.mID == mSpeakerId)
-    {
-        // Check only blocking on voice.
-        // Logic goes in reverse, if flag is set, action is allowed
-        mIsMuted = !(LLMute::flagVoiceChat & mute.mFlags);
-    }
-}
-
-// virtual
-void LLOutputMonitorCtrl::switchIndicator(bool switch_on)
-{
-    if ((mChannelState != INACTIVE_CHANNEL) && (getVisible() != (bool)switch_on))
-    {
-        setVisible(switch_on);
-        
-        //Let parent adjust positioning of icons adjacent to speaker indicator
-        //(when speaker indicator hidden, adjacent icons move to right and when speaker
-        //indicator visible, adjacent icons move to the left) 
-        if (getParent() && getParent()->isInVisibleChain())
-        {
-            notifyParentVisibilityChanged();
-            //Ignore toggled state in case it was set when parent visibility was hidden
-            mIndicatorToggled = false;
-        }
-        else
-        {
-            //Makes sure to only adjust adjacent icons when parent becomes visible
-            //(!mIndicatorToggled ensures that changes of TFT and FTF are discarded, real state changes are TF or FT)
-            mIndicatorToggled = !mIndicatorToggled;
-        }
-
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-// PRIVATE SECTION
-//////////////////////////////////////////////////////////////////////////
-void LLOutputMonitorCtrl::notifyParentVisibilityChanged()
-{
-	LL_DEBUGS("SpeakingIndicator") << "Notify parent that visibility was changed: " << mSpeakerId << ", new_visibility: " << getVisible() << LL_ENDL;
-
-	LLSD params = LLSD().with("visibility_changed", getVisible());
-
-	notifyParent(params);
-}
-
-// EOF
+/**

+ * @file lloutputmonitorctrl.cpp

+ * @brief LLOutputMonitorCtrl base class

+ *

+ * $LicenseInfo:firstyear=2001&license=viewerlgpl$

+ * Second Life Viewer Source Code

+ * Copyright (C) 2010, Linden Research, Inc.

+ *

+ * This library is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU Lesser General Public

+ * License as published by the Free Software Foundation;

+ * version 2.1 of the License only.

+ *

+ * This library is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * Lesser General Public License for more details.

+ *

+ * You should have received a copy of the GNU Lesser General Public

+ * License along with this library; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

+ *

+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA

+ * $/LicenseInfo$

+ */

+

+#include "llviewerprecompiledheaders.h"

+#include "lloutputmonitorctrl.h"

+

+// library includes

+#include "llfloaterreg.h"

+#include "llui.h"

+

+// viewer includes

+#include "llvoiceclient.h"

+#include "llmutelist.h"

+#include "llagent.h"

+

+// default options set in output_monitor.xml

+static LLDefaultChildRegistry::Register<LLOutputMonitorCtrl> r("output_monitor");

+

+// The defaults will be initialized in the constructor.

+//LLColor4  LLOutputMonitorCtrl::sColorMuted;

+//LLColor4  LLOutputMonitorCtrl::sColorOverdriven;

+//LLColor4  LLOutputMonitorCtrl::sColorNormal;

+LLColor4    LLOutputMonitorCtrl::sColorBound;

+//S32           LLOutputMonitorCtrl::sRectsNumber       = 0;

+//F32           LLOutputMonitorCtrl::sRectWidthRatio    = 0.f;

+//F32           LLOutputMonitorCtrl::sRectHeightRatio   = 0.f;

+

+LLOutputMonitorCtrl::Params::Params()

+:   draw_border("draw_border"),

+    image_mute("image_mute"),

+    image_off("image_off"),

+    image_on("image_on"),

+    image_level_1("image_level_1"),

+    image_level_2("image_level_2"),

+    image_level_3("image_level_3"),

+    auto_update("auto_update"),

+    speaker_id("speaker_id")

+{

+};

+

+LLOutputMonitorCtrl::LLOutputMonitorCtrl(const LLOutputMonitorCtrl::Params& p)

+:   LLView(p),

+    mPower(0),

+    mImageMute(p.image_mute),

+    mImageOff(p.image_off),

+    mImageOn(p.image_on),

+    mImageLevel1(p.image_level_1),

+    mImageLevel2(p.image_level_2),

+    mImageLevel3(p.image_level_3),

+    mAutoUpdate(p.auto_update),

+    mSpeakerId(p.speaker_id),

+    mIsModeratorMuted(false),

+    mIsAgentControl(false),

+    mIndicatorToggled(false),

+    mShowParticipantsSpeaking(false),

+    mChannelState(INACTIVE_CHANNEL)

+{

+    //static LLUIColor output_monitor_muted_color = LLUIColorTable::instance().getColor("OutputMonitorMutedColor", LLColor4::orange);

+    //static LLUIColor output_monitor_overdriven_color = LLUIColorTable::instance().getColor("OutputMonitorOverdrivenColor", LLColor4::red);

+    //static LLUIColor output_monitor_normal_color = LLUIColorTable::instance().getColor("OutputMonitorNotmalColor", LLColor4::green);

+    static LLUIColor output_monitor_bound_color = LLUIColorTable::instance().getColor("OutputMonitorBoundColor", LLColor4::white);

+    //static LLUICachedControl<S32> output_monitor_rects_number("OutputMonitorRectanglesNumber", 20);

+    //static LLUICachedControl<F32> output_monitor_rect_width_ratio("OutputMonitorRectangleWidthRatio", 0.5f);

+    //static LLUICachedControl<F32> output_monitor_rect_height_ratio("OutputMonitorRectangleHeightRatio", 0.8f);

+

+    // IAN BUG compare to existing pattern where these are members - some will change per-widget and need to be anyway

+    // sent feedback to PE

+

+    // *TODO: it looks suboptimal to load the defaults every time an output monitor is constructed.

+    //sColorMuted           = output_monitor_muted_color;

+    //sColorOverdriven  = output_monitor_overdriven_color;

+    //sColorNormal      = output_monitor_normal_color;

+    sColorBound         = output_monitor_bound_color;

+    //sRectsNumber      = output_monitor_rects_number;

+    //sRectWidthRatio       = output_monitor_rect_width_ratio;

+    //sRectHeightRatio  = output_monitor_rect_height_ratio;

+

+    mBorder = p.draw_border;

+

+    //with checking mute state

+    setSpeakerId(mSpeakerId);

+}

+

+LLOutputMonitorCtrl::~LLOutputMonitorCtrl()

+{

+    LLMuteList::getInstance()->removeObserver(this);

+    LLSpeakingIndicatorManager::unregisterSpeakingIndicator(mSpeakerId, this);

+}

+

+void LLOutputMonitorCtrl::setPower(F32 val)

+{

+    mPower = llmax(0.f, llmin(1.f, val));

+}

+

+void LLOutputMonitorCtrl::draw()

+{

+    // Copied from llmediaremotectrl.cpp

+    // *TODO: Give the LLOutputMonitorCtrl an agent-id to monitor, then

+    // call directly into LLVoiceClient::getInstance() to ask if that agent-id is muted, is

+    // speaking, and what power.  This avoids duplicating data, which can get

+    // out of sync.

+    const F32 LEVEL_0 = LLVoiceClient::OVERDRIVEN_POWER_LEVEL / 3.f;

+    const F32 LEVEL_1 = LLVoiceClient::OVERDRIVEN_POWER_LEVEL * 2.f / 3.f;

+    const F32 LEVEL_2 = LLVoiceClient::OVERDRIVEN_POWER_LEVEL;

+

+    if (getVisible() && mAutoUpdate && !getIsMuted() && mSpeakerId.notNull())

+    {

+        setPower(LLVoiceClient::getInstance()->getCurrentPower(mSpeakerId));

+        if(mIsAgentControl)

+        {

+            setIsTalking(LLVoiceClient::getInstance()->getUserPTTState());

+        }

+        else

+        {

+            setIsTalking(LLVoiceClient::getInstance()->getIsSpeaking(mSpeakerId));

+        }

+    }

+

+    if ((mPower == 0.f && !mIsTalking) && mShowParticipantsSpeaking)

+    {

+        std::set<LLUUID> participant_uuids;

+        LLVoiceClient::instance().getParticipantList(participant_uuids);

+        std::set<LLUUID>::const_iterator part_it = participant_uuids.begin();

+

+        F32 power = 0;

+        for (; part_it != participant_uuids.end(); ++part_it)

+        {

+            power = LLVoiceClient::instance().getCurrentPower(*part_it);

+            if (power)

+            {

+                mPower = power;

+                break;

+            }

+        }

+    }

+

+    LLPointer<LLUIImage> icon;

+    if (getIsMuted())

+    {

+        icon = mImageMute;

+    }

+    else if (mPower == 0.f && !mIsTalking)

+    {

+        // only show off if PTT is not engaged

+        icon = mImageOff;

+    }

+    else if (mPower < LEVEL_0)

+    {

+        // PTT is on, possibly with quiet background noise

+        icon = mImageOn;

+    }

+    else if (mPower < LEVEL_1)

+    {

+        icon = mImageLevel1;

+    }

+    else if (mPower < LEVEL_2)

+    {

+        icon = mImageLevel2;

+    }

+    else

+    {

+        // overdriven

+        icon = mImageLevel3;

+    }

+

+    if (icon)

+    {

+        icon->draw(0, 0);

+    }

+

+    //

+    // Fill the monitor with a bunch of small rectangles.

+    // The rectangles will be filled with gradient color,

+    // beginning with sColorNormal and ending with sColorOverdriven.

+    //

+    // *TODO: would using a (partially drawn) pixmap instead be faster?

+    //

+    const int monh      = getRect().getHeight();

+    const int monw      = getRect().getWidth();

+    //int maxrects      = sRectsNumber;

+    //const int period  = llmax(1, monw / maxrects, 0, 0);                    // "1" - min value for the period

+    //const int rectw       = llmax(1, llfloor(period * sRectWidthRatio), 0, 0);  // "1" - min value for the rect's width

+    //const int recth       = llfloor(monh * sRectHeightRatio);

+

+    //if(period == 1 && rectw == 1) //if we have so small control, then "maxrects = monitor's_width - 2*monitor_border's_width

+    //  maxrects = monw-2;

+

+    //const int nrects  = mIsMuted ? maxrects : llfloor(mPower * maxrects); // how many rects to draw?

+    //const int rectbtm = (monh - recth) / 2;

+    //const int recttop = rectbtm + recth;

+    //

+    //LLColor4 rect_color;

+    //

+    //for (int i=1, xpos = 0; i <= nrects; i++)

+    //{

+    //  // Calculate color to use for the current rectangle.

+    //  if (mIsMuted)

+    //  {

+    //      rect_color = sColorMuted;

+    //  }

+    //  else

+    //  {

+    //      F32 frac = (mPower * i/nrects) / LLVoiceClient::OVERDRIVEN_POWER_LEVEL;

+    //      // Use overdriven color if the power exceeds overdriven level.

+    //      if (frac > 1.0f)

+    //          frac = 1.0f;

+    //      rect_color = lerp(sColorNormal, sColorOverdriven, frac);

+    //  }

+

+    //  // Draw rectangle filled with the color.

+    //  gl_rect_2d(xpos, recttop, xpos+rectw, rectbtm, rect_color, true);

+    //  xpos += period;

+    //}

+

+    //

+    // Draw bounding box.

+    //

+    if(mBorder)

+        gl_rect_2d(0, monh, monw, 0, sColorBound, false);

+}

+

+// virtual

+bool LLOutputMonitorCtrl::handleMouseUp(S32 x, S32 y, MASK mask)

+{

+    if (mSpeakerId != gAgentID)

+    {

+        LLFloaterReg::showInstance("floater_voice_volume", LLSD().with("avatar_id", mSpeakerId));

+    }

+    else if (mShowParticipantsSpeaking)

+    {

+        LLFloaterReg::showInstance("chat_voice", LLSD());

+    }

+

+    return true;

+}

+

+void LLOutputMonitorCtrl::setIsActiveChannel(bool val)

+{

+    setChannelState(val ? ACTIVE_CHANNEL : INACTIVE_CHANNEL);

+}

+

+void LLOutputMonitorCtrl::setChannelState(EChannelState state)

+{

+    mChannelState = state;

+    if (state == INACTIVE_CHANNEL)

+    {

+        // switchIndicator will set it to true when channel becomes active

+        setVisible(false);

+    }

+}

+

+void LLOutputMonitorCtrl::setSpeakerId(const LLUUID& speaker_id, const LLUUID& session_id/* = LLUUID::null*/, bool show_other_participants_speaking /* = false */)

+{

+    if (speaker_id.isNull() && mSpeakerId.notNull())

+    {

+        LLSpeakingIndicatorManager::unregisterSpeakingIndicator(mSpeakerId, this);

+        switchIndicator(false);

+        mSpeakerId = speaker_id;

+    }

+

+    if (speaker_id.isNull() || (speaker_id == mSpeakerId))

+    {

+        return;

+    }

+

+    if (mSpeakerId.notNull())

+    {

+        // Unregister previous registration to avoid crash. EXT-4782.

+        LLSpeakingIndicatorManager::unregisterSpeakingIndicator(mSpeakerId, this);

+    }

+

+    mShowParticipantsSpeaking = show_other_participants_speaking;

+    mSpeakerId = speaker_id;

+    LLSpeakingIndicatorManager::registerSpeakingIndicator(mSpeakerId, this, session_id);

+

+    //mute management

+    if (mAutoUpdate)

+    {

+        if (speaker_id == gAgentID)

+        {

+            mIsMuted = false;

+        }

+        else

+        {

+            // check only blocking on voice. EXT-3542

+            mIsMuted = LLMuteList::getInstance()->isMuted(mSpeakerId, LLMute::flagVoiceChat);

+            LLMuteList::getInstance()->addObserver(this);

+        }

+    }

+}

+

+void LLOutputMonitorCtrl::onChangeDetailed(const LLMute& mute)

+{

+    if (mute.mID == mSpeakerId)

+    {

+        // Check only blocking on voice.

+        // Logic goes in reverse, if flag is set, action is allowed

+        mIsMuted = !(LLMute::flagVoiceChat & mute.mFlags);

+    }

+}

+

+// virtual

+void LLOutputMonitorCtrl::switchIndicator(bool switch_on)

+{

+    if ((mChannelState != INACTIVE_CHANNEL) && (getVisible() != (bool)switch_on))

+    {

+        setVisible(switch_on);

+

+        //Let parent adjust positioning of icons adjacent to speaker indicator

+        //(when speaker indicator hidden, adjacent icons move to right and when speaker

+        //indicator visible, adjacent icons move to the left)

+        if (getParent() && getParent()->isInVisibleChain())

+        {

+            notifyParentVisibilityChanged();

+            //Ignore toggled state in case it was set when parent visibility was hidden

+            mIndicatorToggled = false;

+        }

+        else

+        {

+            //Makes sure to only adjust adjacent icons when parent becomes visible

+            //(!mIndicatorToggled ensures that changes of TFT and FTF are discarded, real state changes are TF or FT)

+            mIndicatorToggled = !mIndicatorToggled;

+        }

+

+    }

+}

+

+//////////////////////////////////////////////////////////////////////////

+// PRIVATE SECTION

+//////////////////////////////////////////////////////////////////////////

+void LLOutputMonitorCtrl::notifyParentVisibilityChanged()

+{

+    LL_DEBUGS("SpeakingIndicator") << "Notify parent that visibility was changed: " << mSpeakerId << ", new_visibility: " << getVisible() << LL_ENDL;

+

+    LLSD params = LLSD().with("visibility_changed", getVisible());

+

+    notifyParent(params);

+}

+

+// EOF