summaryrefslogtreecommitdiff
path: root/indra/newview/llcallfloater.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-09 11:25:45 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-09 11:25:45 +0100
commit59a90f197f9b36077f20da4de5945ed93526df26 (patch)
treec433bc16dac6116925399af1382b7737ab1c26af /indra/newview/llcallfloater.cpp
parent95e9e569bfaf713eb71f3dba7206aceae06f74f6 (diff)
parent4ed913c3760308ea67db8beb9e6330933104a8ab (diff)
merge from viewer-trunk
Diffstat (limited to 'indra/newview/llcallfloater.cpp')
-rw-r--r--indra/newview/llcallfloater.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp
index 44f1cefafe..bed5c01d7a 100644
--- a/indra/newview/llcallfloater.cpp
+++ b/indra/newview/llcallfloater.cpp
@@ -133,7 +133,7 @@ LLCallFloater::~LLCallFloater()
if(LLVoiceClient::instanceExists())
{
- gVoiceClient->removeObserver(this);
+ LLVoiceClient::instance().removeObserver(this);
}
LLTransientFloaterMgr::getInstance()->removeControlView(this);
}