diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2019-08-12 09:58:08 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2019-08-12 09:58:08 -0400 |
commit | 5a72d34b7676031da35f93c91eda3eab01085aff (patch) | |
tree | 4677bc0b7330af7ff142d286eb4feee5126a8d7e /indra/newview/llvoicecallhandler.cpp | |
parent | f0fa4f94a5400fe5d21cf5bf7570129916bf9787 (diff) | |
parent | 98be6e141c1232bad28cc115bc7092f175b18809 (diff) |
Automated merge with file:///Users/nat/linden/viewer-catch
Diffstat (limited to 'indra/newview/llvoicecallhandler.cpp')
-rw-r--r-- | indra/newview/llvoicecallhandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoicecallhandler.cpp b/indra/newview/llvoicecallhandler.cpp index 2050dab689..1e993d1384 100644 --- a/indra/newview/llvoicecallhandler.cpp +++ b/indra/newview/llvoicecallhandler.cpp @@ -40,7 +40,7 @@ public: bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web) { - if (!LLUI::sSettingGroups["config"]->getBOOL("EnableVoiceCall")) + if (!LLUI::getInstance()->mSettingGroups["config"]->getBOOL("EnableVoiceCall")) { LLNotificationsUtil::add("NoVoiceCall", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit")); return true; |