diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-12-10 16:21:33 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-12-10 16:21:33 -0800 |
| commit | 316dd9a9dd10f5516b98e7cfecacf88509aac4b5 (patch) | |
| tree | 6ff2f1df251df1bcd9122127fb18c9f217ce49ea /indra | |
| parent | 6c21e9262e357f8c85f4fc5a2d7948836f63f8ae (diff) | |
| parent | 0acb54eb77ad210b8cefa07ca42f9c911781f155 (diff) | |
Merge
Diffstat (limited to 'indra')
| -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 |