diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-10-01 17:44:44 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-10-01 17:44:44 +0000 |
| commit | f05df68656d2abdc38d86cd6746398fa90eb8614 (patch) | |
| tree | 95f389551a7132b86dd96ff7c55b92674ee16756 /indra/newview/llfloaterchatterbox.cpp | |
| parent | 090977608d3d4e1d6d26689064910221c66f6084 (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3
* Bugs: EXT-1111 EXT-915 EXT-1131 EXT-1200 EXT-1202 EXT-1201 EXT-1205 EXT-1212 EXT-1173 EXT-1229 EXT-1218 EXT-1164 EXT-996 EXT-821 EXT-1030 EXT-1031 EXT-816
* Major Bugs: EXT-1142 (timeout during login due to processing group IMs)
* Changes: EXT-1216 (minimize message well)
Diffstat (limited to 'indra/newview/llfloaterchatterbox.cpp')
| -rw-r--r-- | indra/newview/llfloaterchatterbox.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloaterchatterbox.cpp b/indra/newview/llfloaterchatterbox.cpp index 05ea800d0e..dea656b0e4 100644 --- a/indra/newview/llfloaterchatterbox.cpp +++ b/indra/newview/llfloaterchatterbox.cpp @@ -363,7 +363,8 @@ LLFloater* LLFloaterChatterBox::getCurrentVoiceFloater() { // only LLFloaterIMPanels are called "im_floater" LLFloaterIMPanel* im_floaterp = (LLFloaterIMPanel*)panelp; - if (im_floaterp->getVoiceChannel() == LLVoiceChannel::getCurrentVoiceChannel()) + LLVoiceChannel* voice_channel = LLIMModel::getInstance()->getVoiceChannel(im_floaterp->getSessionID()); + if (voice_channel == LLVoiceChannel::getCurrentVoiceChannel()) { return im_floaterp; } |