summaryrefslogtreecommitdiff
path: root/indra/llui/llfloaterreg.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2019-11-12 04:24:35 +0200
committerAndreyL ProductEngine <alihatskiy@productengine.com>2019-11-12 04:24:35 +0200
commit91fa31c065a582b9ead8a3d2f537c9b3d72474ee (patch)
tree50a83e42321a2b611df7c8e3f72ef452f868c591 /indra/llui/llfloaterreg.cpp
parent2d69438ee37a2224698418c2d00b19015b70b2b5 (diff)
parentf13cc44f8999a9897c77411d1296582b7bc1f08d (diff)
Downstream merge from lindenlab/viewer-serval
Diffstat (limited to 'indra/llui/llfloaterreg.cpp')
-rw-r--r--indra/llui/llfloaterreg.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llfloaterreg.cpp b/indra/llui/llfloaterreg.cpp
index 9ef290abc0..85e07fc6a6 100644
--- a/indra/llui/llfloaterreg.cpp
+++ b/indra/llui/llfloaterreg.cpp
@@ -445,7 +445,7 @@ void LLFloaterReg::registerControlVariables()
}
}
- const LLSD& exclude_list = LLUI::sSettingGroups["config"]->getLLSD("always_showable_floaters");
+ const LLSD& exclude_list = LLUI::getInstance()->mSettingGroups["config"]->getLLSD("always_showable_floaters");
for (LLSD::array_const_iterator iter = exclude_list.beginArray();
iter != exclude_list.endArray();
iter++)