summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterchatterbox.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-05-12 11:44:16 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-05-12 11:44:16 +0100
commit3d39634cbd3abe4df7b9ce8d229e59c3087de713 (patch)
tree91c436bb6370e511fc2679e8f7b7ca22b7114f70 /indra/newview/llfloaterchatterbox.cpp
parent4a3222d9c12812db70f2c9ec0050012d01155565 (diff)
parent1cee577ca0234eee7da243c85be8eb7524d691c7 (diff)
merge from viewer-public
Diffstat (limited to 'indra/newview/llfloaterchatterbox.cpp')
-rw-r--r--indra/newview/llfloaterchatterbox.cpp2
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;
}