diff options
| author | leyla_linden <none@none> | 2010-12-31 12:55:04 -0800 |
|---|---|---|
| committer | leyla_linden <none@none> | 2010-12-31 12:55:04 -0800 |
| commit | 350a736d37de282e1e3c22627400d957f0e00dc5 (patch) | |
| tree | 7427e593ce39ad2c50e1f217bad5b211a9eb3928 /indra/llcommon/llevents.cpp | |
| parent | d196348d0f4bd542eee3702329dab28952b8a5e5 (diff) | |
| parent | e3204165b9bb9b36cb11a8d0a4a4040634e707fc (diff) | |
Merge
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 |