From 89a510de10c48ebcf82b98a962e4bf66477dcc93 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 4 Sep 2009 01:56:20 -0500
Subject: Applied Kitty Barnett's RLVa 1.0.1h (Restrained Life) patch.

Made a few non-functional changes to help it apply.
---
 linden/indra/newview/llfloateractivespeakers.cpp | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'linden/indra/newview/llfloateractivespeakers.cpp')

diff --git a/linden/indra/newview/llfloateractivespeakers.cpp b/linden/indra/newview/llfloateractivespeakers.cpp
index a8f3f91..b4d402a 100644
--- a/linden/indra/newview/llfloateractivespeakers.cpp
+++ b/linden/indra/newview/llfloateractivespeakers.cpp
@@ -98,6 +98,11 @@ void LLSpeaker::onAvatarNameLookup(const LLUUID& id, const std::string& first, c
 	if (speaker_ptr)
 	{
 		speaker_ptr->mDisplayName = first + " " + last;
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Added: RLVa-1.0.0g
+		// TODO-RLVa: this seems to get called per frame which is very likely an LL bug that will eventuall get fixed
+		if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+			speaker_ptr->mDisplayName = gRlvHandler.getAnonym(speaker_ptr->mDisplayName);
+// [/RLVa:KB]
 	}
 }
 
@@ -710,6 +715,13 @@ void LLPanelActiveSpeakers::onVolumeChange(LLUICtrl* source, void* user_data)
 //static 
 void LLPanelActiveSpeakers::onClickProfile(void* user_data)
 {
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Added: RLVa-1.0.0g
+	if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+	{
+		return;
+	}
+// [/RLVa:KB]
+
 	LLPanelActiveSpeakers* panelp = (LLPanelActiveSpeakers*)user_data;
 	LLUUID speaker_id = panelp->mSpeakerList->getValue().asUUID();
 
@@ -719,6 +731,13 @@ void LLPanelActiveSpeakers::onClickProfile(void* user_data)
 //static
 void LLPanelActiveSpeakers::onDoubleClickSpeaker(void* user_data)
 {
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Added: RLVa-1.0.0g
+	if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+	{
+		return;
+	}
+// [/RLVa:KB]
+
 	LLPanelActiveSpeakers* panelp = (LLPanelActiveSpeakers*)user_data;
 	LLUUID speaker_id = panelp->mSpeakerList->getValue().asUUID();
 
-- 
cgit v1.1