summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndrew A. de Laix <alain@lindenlab.com>2010-12-13 12:37:54 -0800
committerAndrew A. de Laix <alain@lindenlab.com>2010-12-13 12:37:54 -0800
commit5b7a3d3a36b4bd01da80a0093bbc3e533f116f71 (patch)
tree0fe85b30aaca6a5762603118d6d903dffae97e0a /indra
parent93a5c59ee7ed90d8f012dace4cd4588e7367fbf5 (diff)
parent62b9513353900079602bf29c3b8863697a50e46f (diff)
Automated merge with https://bitbucket.org/mani_linden/viewer-development/
Diffstat (limited to 'indra')
-rw-r--r--indra/llcommon/llevents.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llevents.cpp b/indra/llcommon/llevents.cpp
index 723cbd68c7..97e2bdeb57 100644
--- a/indra/llcommon/llevents.cpp
+++ b/indra/llcommon/llevents.cpp
@@ -515,7 +515,7 @@ bool LLEventQueue::post(const LLSD& event)
void LLEventQueue::flush()
{
- if(!mEnabled || !mSignal) return;
+ if(!mSignal) return;
// Consider the case when a given listener on this LLEventQueue posts yet
// another event on the same queue. If we loop over mEventQueue directly,