diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2010-12-10 18:42:24 -0800 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2010-12-10 18:42:24 -0800 |
| commit | 93a5c59ee7ed90d8f012dace4cd4588e7367fbf5 (patch) | |
| tree | 21b21b15acefabb50c43d3c3f988ec8f705f33e5 /indra/llcommon | |
| parent | e58965255d1edcb44256e1b27d813167df746034 (diff) | |
| parent | 316dd9a9dd10f5516b98e7cfecacf88509aac4b5 (diff) | |
Merge.
Diffstat (limited to 'indra/llcommon')
| -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..723cbd68c7 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(!mEnabled || !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 |