diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:41:05 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:41:05 -0500 |
| commit | e4591a85182133811e327b579c558bb3db80d79e (patch) | |
| tree | 13c4847d919939c9b50386d1dfcbc5837201c60e /indra/llcommon/llevents.cpp | |
| parent | d420ca89b438ebfb15dd3be8f5ec427361dfddaa (diff) | |
| parent | 67ced403e624599f23020c8b8bd802947e602d31 (diff) | |
merge changes for storm-466
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 |