summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorEugene Mutavchi <emutavchi@productengine.com>2009-12-10 20:07:16 +0200
committerEugene Mutavchi <emutavchi@productengine.com>2009-12-10 20:07:16 +0200
commit862681b53a61783d292782c2415e8c5caddde136 (patch)
treed9144046d853225d25cfadcdaa5afa7ded6bc67b /indra/newview
parent3e13bc913f3e527b1a9d4f500ad038c06cdf6525 (diff)
Fixed normal bug EXT-3095 (Mute sign is shown in Voice control panel for speaking avatar (refer to screenshot))
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llcallfloater.cpp17
1 files changed, 11 insertions, 6 deletions
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp
index 895b4ed80e..d9fc4d54ab 100644
--- a/indra/newview/llcallfloater.cpp
+++ b/indra/newview/llcallfloater.cpp
@@ -263,13 +263,18 @@ void LLCallFloater::updateTitle()
void LLCallFloater::initAgentData()
{
- childSetValue("user_icon", gAgentID);
+ LLPanel* my_panel = getChild<LLPanel> ("my_panel");
- std::string name;
- gCacheName->getFullName(gAgentID, name);
- childSetValue("user_text", name);
+ if ( my_panel )
+ {
+ my_panel->childSetValue("user_icon", gAgentID);
+
+ std::string name;
+ gCacheName->getFullName(gAgentID, name);
+ my_panel->childSetValue("user_text", name);
- LLOutputMonitorCtrl* speaking_indicator = getChild<LLOutputMonitorCtrl>("speaking_indicator");
- speaking_indicator->setSpeakerId(gAgentID);
+ LLOutputMonitorCtrl* speaking_indicator = my_panel->getChild<LLOutputMonitorCtrl>("speaking_indicator");
+ speaking_indicator->setSpeakerId(gAgentID);
+ }
}
//EOF