summaryrefslogtreecommitdiff
path: root/indra/newview/llcallfloater.cpp
diff options
context:
space:
mode:
authorAimee Linden <aimee@lindenlab.com>2010-04-09 01:29:44 +0100
committerAimee Linden <aimee@lindenlab.com>2010-04-09 01:29:44 +0100
commitf363a8898ded0896cf6dde81081cff046c7fa3a8 (patch)
treea44452f7467e9c2060e3b165283cb1c2cf1f6723 /indra/newview/llcallfloater.cpp
parent5a8770c9e37ae3ebe6fca7f8a631be4179763aed (diff)
parent4ed913c3760308ea67db8beb9e6330933104a8ab (diff)
merge
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 6dfa8397a0..f13e74679d 100644
--- a/indra/newview/llcallfloater.cpp
+++ b/indra/newview/llcallfloater.cpp
@@ -135,7 +135,7 @@ LLCallFloater::~LLCallFloater()
if(LLVoiceClient::instanceExists())
{
- gVoiceClient->removeObserver(this);
+ LLVoiceClient::instance().removeObserver(this);
}
LLTransientFloaterMgr::getInstance()->removeControlView(this);
}