diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-05 17:54:12 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-05 17:54:12 -0500 |
| commit | 1034db639462d95e54e9bf9e4d63500b745bb0a2 (patch) | |
| tree | 68b010fb3f9f2c4b67e59187d125090b1c69d72f /indra/llcommon/llevents.cpp | |
| parent | 0eb491417e8479516b07cc9237242b60d36d10f5 (diff) | |
| parent | eb0b8ab3ea19617a52881191bab21bfedcc5696d (diff) | |
merge changes for storm-806
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 |