diff options
| author | Rider Linden <rider@lindenlab.com> | 2016-04-21 11:54:33 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2016-04-21 11:54:33 -0700 |
| commit | 6ad159c05288d80debb8cf71df61ec5462410fe8 (patch) | |
| tree | 1a97c4bdecb94713b105bb94b337ad2c893911a6 /indra/llcommon | |
| parent | 7de3a6e81971cb239ec4691e37e6718ecabd00d8 (diff) | |
| parent | 8f4be8bb869e3cde034607cbe0cb8272005f08b8 (diff) | |
MAINT-6336: Merge
Diffstat (limited to 'indra/llcommon')
| -rwxr-xr-x | indra/llcommon/lleventfilter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/lleventfilter.h b/indra/llcommon/lleventfilter.h index e822a664f5..8e01326823 100755 --- a/indra/llcommon/lleventfilter.h +++ b/indra/llcommon/lleventfilter.h @@ -181,7 +181,7 @@ protected: private: bool tick(const LLSD&); - LLBoundListener mMainloop; + LLTempBoundListener mMainloop; Action mAction; }; |