diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2010-12-10 16:15:52 -0800 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-12-10 16:15:52 -0800 |
| commit | 0acb54eb77ad210b8cefa07ca42f9c911781f155 (patch) | |
| tree | 8372e6bc606b16c7981a8b6fb5bb76aa8afd7e37 | |
| parent | d85c7264da14a753e055990fe9b653bbd5847300 (diff) | |
| parent | 56a39aa914fe32c1986202dc39a3ad4604943b39 (diff) | |
Automated merge with https://bitbucket.org/mani_linden/viewer-development/
| -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 |