summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2015-12-22 10:17:44 -0800
committerRider Linden <rider@lindenlab.com>2015-12-22 10:17:44 -0800
commitae1c75c1c80ce4ad658dac960ca68e308eec5322 (patch)
tree14e530187a4b46a274d325c2aa2605dbc33671c1 /indra
parentc6fd58f0c4ba098d2c4a3d9abc70c8152b50e54a (diff)
MAINT-5976: Removed temp code to simulate Nat's fix. Now redundant.
Diffstat (limited to 'indra')
-rwxr-xr-xindra/llcommon/llevents.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llcommon/llevents.cpp b/indra/llcommon/llevents.cpp
index 0c5e55dc76..645c29d770 100755
--- a/indra/llcommon/llevents.cpp
+++ b/indra/llcommon/llevents.cpp
@@ -57,7 +57,6 @@
#include "stringize.h"
#include "llerror.h"
#include "llsdutil.h"
-#include "llcoros.h"
#if LL_MSVC
#pragma warning (disable : 4702)
#endif
@@ -534,7 +533,7 @@ LLBoundListener LLEventMailDrop::listen_impl(const std::string& name,
{
if (!mEventHistory.empty())
{
- if (listener(mEventHistory.front()) || LLCoros::get_consuming())
+ if (listener(mEventHistory.front()))
{
mEventHistory.pop_front();
}