summaryrefslogtreecommitdiff
path: root/indra/llui/llurlentry.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2019-08-12 09:58:08 -0400
committerNat Goodspeed <nat@lindenlab.com>2019-08-12 09:58:08 -0400
commit5a72d34b7676031da35f93c91eda3eab01085aff (patch)
tree4677bc0b7330af7ff142d286eb4feee5126a8d7e /indra/llui/llurlentry.cpp
parentf0fa4f94a5400fe5d21cf5bf7570129916bf9787 (diff)
parent98be6e141c1232bad28cc115bc7092f175b18809 (diff)
Automated merge with file:///Users/nat/linden/viewer-catch
Diffstat (limited to 'indra/llui/llurlentry.cpp')
-rw-r--r--indra/llui/llurlentry.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index cd9b52d164..63ed427ab5 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -176,7 +176,7 @@ void LLUrlEntryBase::callObservers(const std::string &id,
bool LLUrlEntryBase::isLinkDisabled() const
{
// this allows us to have a global setting to turn off text hyperlink highlighting/action
- bool globally_disabled = LLUI::sSettingGroups["config"]->getBOOL("DisableTextHyperlinkActions");
+ bool globally_disabled = LLUI::getInstance()->mSettingGroups["config"]->getBOOL("DisableTextHyperlinkActions");
return globally_disabled;
}