diff options
author | Oz Linden <oz@lindenlab.com> | 2018-05-31 17:35:35 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2018-05-31 17:35:35 -0400 |
commit | c0e00cc61750d2b1bba3ada6622023df4725b1a4 (patch) | |
tree | f0cc704c8af726f27164cb569cc77e6f55e533d2 /indra/llxml/llcontrol.h | |
parent | e56be73dc646d414c7a10621ac489add6762267b (diff) | |
parent | 40d4e8b2e6d25a625c7a5ef5dd3e94321d18ce82 (diff) |
merge changes for 5.1.5-release
Diffstat (limited to 'indra/llxml/llcontrol.h')
-rw-r--r-- | indra/llxml/llcontrol.h | 3 |
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(); |