diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-10-29 20:43:32 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-10-29 20:43:32 -0700 |
| commit | a7a24dc2f9450e0d51e7110a7eb44e0f27a010db (patch) | |
| tree | 296b5344b33734babfde6aeecb36af2e005ddc32 /indra/newview/llchiclet.cpp | |
| parent | 480c3a1acb32e98d0d64aaf7bb70e4d61e6882f6 (diff) | |
| parent | 1a1a0b91c0c4400ec3febac183124314f9226127 (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llchiclet.cpp')
| -rw-r--r-- | indra/newview/llchiclet.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp index 17181edffc..e328186fd6 100644 --- a/indra/newview/llchiclet.cpp +++ b/indra/newview/llchiclet.cpp @@ -34,6 +34,7 @@ #include "llgroupactions.h" #include "lliconctrl.h" #include "llimfloater.h" +#include "llimfloatercontainer.h" #include "llimview.h" #include "llfloaterreg.h" #include "lllocalcliprect.h" @@ -1196,7 +1197,7 @@ void LLChicletPanel::onCurrentVoiceChannelChanged(const LLUUID& session_id) chiclet->setShowSpeaker(true); if (gSavedSettings.getBOOL("OpenIMOnVoice")) { - LLIMFloater::show(chiclet->getSessionId()); + LLIMFloaterContainer::getInstance()->showConversation(session_id); } } } |