summaryrefslogtreecommitdiff
path: root/indra/newview/llchiclet.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2011-05-03 17:12:43 -0700
committerLeyla Farazha <leyla@lindenlab.com>2011-05-03 17:12:43 -0700
commit950b74c1705cc7d72c5f05fd707ba230b00027f0 (patch)
tree6cbf1d703f42fa20ff97b7b5c31d3e75f8654015 /indra/newview/llchiclet.cpp
parent8cc430f691fe65cd03cbac1c4246d836000babd1 (diff)
EXP-778 Bring up corresponding IM window on connect to new voice call.
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());
+ }
}
}