summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorAndrey Lihatskiy <andreylproductengine@lindenlab.com>2016-04-22 04:23:53 +0300
committerAndrey Lihatskiy <andreylproductengine@lindenlab.com>2016-04-22 04:23:53 +0300
commitd6f454831fd1386a5e84713b06820e8bdc176e4f (patch)
tree64fa725e7b96786662c186ca1763ef89bc681028 /indra/llcommon
parent56f736b65473d67b0a0d817e3c4d0b266a82f856 (diff)
parent6ad159c05288d80debb8cf71df61ec5462410fe8 (diff)
Merged lindenlab/viewer-bear into default
Diffstat (limited to 'indra/llcommon')
-rwxr-xr-xindra/llcommon/lleventfilter.h2
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;
};