summaryrefslogtreecommitdiff
path: root/indra/llcommon/lleventcoro.h
diff options
context:
space:
mode:
authorcallum_linden <none@none>2014-12-10 13:02:59 -0800
committercallum_linden <none@none>2014-12-10 13:02:59 -0800
commit2ebc3b0fb0e52c83c60066eb2182275d22a4cced (patch)
tree5aca10ea235eceb8644fd676318c62293a58474c /indra/llcommon/lleventcoro.h
parent6bb3fc93926e93154d9651e16e131ffa4c805a2e (diff)
parent145153bbb2d3d41194c9c4cbadbb69129cb4ab5c (diff)
Merge with head
Diffstat (limited to 'indra/llcommon/lleventcoro.h')
-rwxr-xr-xindra/llcommon/lleventcoro.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/lleventcoro.h b/indra/llcommon/lleventcoro.h
index f55b74ac7e..abbeeaa373 100755
--- a/indra/llcommon/lleventcoro.h
+++ b/indra/llcommon/lleventcoro.h
@@ -67,7 +67,7 @@ public:
LLEventPumpOrPumpName() {}
operator LLEventPump& () const { return *mPump; }
LLEventPump& getPump() const { return *mPump; }
- operator bool() const { return mPump; }
+ operator bool() const { return bool(mPump); }
bool operator!() const { return ! mPump; }
private: