diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2009-06-04 16:24:21 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2009-06-04 16:24:21 +0000 |
| commit | 087bd265534b8e3086ae1af441a9cf0eb7c684df (patch) | |
| tree | a0c911515476d4ac4aac9bd984de28eb7573a478 /indra/newview/llviewercontrol.h | |
| parent | f9b9372027a41900ad572afcd7ea0d2cc5489b8f (diff) | |
Merge of QAR-1383 event-system-7 into trunk.
svn merge -r 121797:121853 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-event-system-7
Diffstat (limited to 'indra/newview/llviewercontrol.h')
| -rw-r--r-- | indra/newview/llviewercontrol.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/indra/newview/llviewercontrol.h b/indra/newview/llviewercontrol.h index d0dc80cb9a..c4003111d3 100644 --- a/indra/newview/llviewercontrol.h +++ b/indra/newview/llviewercontrol.h @@ -84,7 +84,7 @@ class LLCachedControl { T mCachedValue; LLPointer<LLControlVariable> mControl; - boost::signals::connection mConnection; + boost::signals2::scoped_connection mConnection; public: LLCachedControl(const std::string& name, @@ -109,17 +109,13 @@ public: } // Add a listener to the controls signal... - mControl->getSignal()->connect( + mConnection = mControl->getSignal()->connect( boost::bind(&LLCachedControl<T>::handleValueChange, this, _1) ); } ~LLCachedControl() { - if(mConnection.connected()) - { - mConnection.disconnect(); - } } LLCachedControl& operator =(const T& newvalue) |