summaryrefslogtreecommitdiff
path: root/indra/newview/llchiclet.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2011-05-03 17:35:38 -0700
committerMerov Linden <merov@lindenlab.com>2011-05-03 17:35:38 -0700
commita14172dd40fa11196950f391e4fc945e432122bf (patch)
tree77b35f76528e7ef4f0af2150b40686032707f4d8 /indra/newview/llchiclet.cpp
parent45145fe7e2b6855b08b2ab94f07e852ef7ffffa3 (diff)
parent9120a9bf29f103556c051f65dfb16f303f35cba2 (diff)
Sync with viewer-experience
Diffstat (limited to 'indra/newview/llchiclet.cpp')
-rw-r--r--indra/newview/llchiclet.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp
index 277fc9d7b9..3000209aad 100644
--- a/indra/newview/llchiclet.cpp
+++ b/indra/newview/llchiclet.cpp
@@ -1184,6 +1184,10 @@ void LLChicletPanel::onCurrentVoiceChannelChanged(const LLUUID& session_id)
if(chiclet)
{
chiclet->setShowSpeaker(true);
+ if (gSavedSettings.getBOOL("OpenIMOnVoice"))
+ {
+ LLIMFloater::show(chiclet->getSessionId());
+ }
}
}