diff options
| author | Don Kjer <don@lindenlab.com> | 2011-01-07 10:48:38 -0800 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-01-07 10:48:38 -0800 |
| commit | 829c2c86975dd80d13008c38246fa8ea0d10529c (patch) | |
| tree | e90bda161771de9f3fcd98e2806e8eed7c4222fc /indra/llcommon/llevents.cpp | |
| parent | a9bc51e6416dd637080c0307de99d5e09d06dcc4 (diff) | |
| parent | c132d20a7433e2d09e3521a15497f661fcbd18b8 (diff) | |
Merge from viewer-development
Diffstat (limited to 'indra/llcommon/llevents.cpp')
| -rw-r--r-- | indra/llcommon/llevents.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llcommon/llevents.cpp b/indra/llcommon/llevents.cpp index 84a6620a77..97e2bdeb57 100644 --- a/indra/llcommon/llevents.cpp +++ b/indra/llcommon/llevents.cpp @@ -475,7 +475,7 @@ void LLEventPump::stopListening(const std::string& name) *****************************************************************************/ bool LLEventStream::post(const LLSD& event) { - if (! mEnabled) + if (! mEnabled || !mSignal) { return false; } @@ -515,6 +515,8 @@ bool LLEventQueue::post(const LLSD& event) void LLEventQueue::flush() { + 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, // we'll end up processing all those events during the same flush() call |