diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-04-07 13:20:33 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-04-07 13:20:33 -0700 |
| commit | 8ba5517a0827af423e95526043c6cf52b211e73f (patch) | |
| tree | efc9472256e98c97c7af9728080c2f92707219dc /indra/newview/llfloaterchatterbox.cpp | |
| parent | 8ac6310020bd2d524c97c729c29a0afe4a529ecf (diff) | |
| parent | 658ccc3e85487f9f24ff3b5926e60d6cce7f42e0 (diff) | |
Automated merge
Diffstat (limited to 'indra/newview/llfloaterchatterbox.cpp')
| -rw-r--r-- | indra/newview/llfloaterchatterbox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterchatterbox.cpp b/indra/newview/llfloaterchatterbox.cpp index 774caaec90..a15cef7ea4 100644 --- a/indra/newview/llfloaterchatterbox.cpp +++ b/indra/newview/llfloaterchatterbox.cpp @@ -318,7 +318,7 @@ LLFloaterChatterBox* LLFloaterChatterBox::getInstance() //static LLFloater* LLFloaterChatterBox::getCurrentVoiceFloater() { - if (!LLVoiceClient::voiceEnabled()) + if (!LLVoiceClient::getInstance()->voiceEnabled()) { return NULL; } |