summaryrefslogtreecommitdiff
path: root/indra/llxml
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2018-06-14 18:20:55 -0400
committerNat Goodspeed <nat@lindenlab.com>2018-06-14 18:20:55 -0400
commit4dba69b04ab9825f1cd4b8dbf855494a3897ffd7 (patch)
tree2f3a5324daf25ccea323ce5caa8dc238b6e37bbe /indra/llxml
parent9b7640d70ae820a954634ecf0dae43dfb33c0d3a (diff)
parent67f6625c56406604197507c842496f031eb0986f (diff)
Automated merge with file:///Users/nat/linden/viewer-no-vstool
Diffstat (limited to 'indra/llxml')
-rw-r--r--indra/llxml/llcontrol.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llxml/llcontrol.h b/indra/llxml/llcontrol.h
index 77065dcf8d..8136a3e88a 100644
--- a/indra/llxml/llcontrol.h
+++ b/indra/llxml/llcontrol.h
@@ -357,7 +357,8 @@ private:
mCachedValue = convert_from_llsd<T>(controlp->get(), mType, name);
// Add a listener to the controls signal...
- mConnection = controlp->getSignal()->connect(
+ // NOTE: All listeners connected to 0 group, for guaranty that variable handlers (gSavedSettings) call last
+ mConnection = controlp->getSignal()->connect(0,
boost::bind(&LLControlCache<T>::handleValueChange, this, _2)
);
mType = controlp->type();