diff options
author | Aimee Linden <aimee@lindenlab.com> | 2010-04-08 12:37:12 +0100 |
---|---|---|
committer | Aimee Linden <aimee@lindenlab.com> | 2010-04-08 12:37:12 +0100 |
commit | 2b8e82a1f4503ae88ed3f7a97cad74d84c925d33 (patch) | |
tree | 1375d4a396f366297b2b33597058e43c6af2e7d9 /indra/newview/llcallfloater.cpp | |
parent | adce2ecdf8f3a0efcd4907699d286012124ac496 (diff) |
Fix-up some breakage from backing out the SLE merge.
Was causing a crash on viewer exit if the Voice Control Panel was left open and detached.
Diffstat (limited to 'indra/newview/llcallfloater.cpp')
-rw-r--r-- | indra/newview/llcallfloater.cpp | 2 |
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); } |