diff options
| author | Oz Linden <oz@lindenlab.com> | 2018-05-31 17:36:30 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2018-05-31 17:36:30 -0400 |
| commit | 176b8861742e3f80eddbf4d15b9cb21390b21088 (patch) | |
| tree | 783fad5e2fdb9737652b791ec4b97ed1eeec35ca /indra/llxml | |
| parent | d2fa5a53e8b91bd0aba10ab3917c722dc360b610 (diff) | |
| parent | 40d4e8b2e6d25a625c7a5ef5dd3e94321d18ce82 (diff) | |
merge changes for 5.1.5-release
Diffstat (limited to 'indra/llxml')
| -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(); |