summaryrefslogtreecommitdiff
path: root/indra/llui/llnotifications.h
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-02-01 13:10:45 +0200
committerMike Antipov <mantipov@productengine.com>2010-02-01 13:10:45 +0200
commitb3641c35fe00ea93887ea8980bf69624c8299267 (patch)
tree9b575e425986b3f0496192e95009ba2297158de3 /indra/llui/llnotifications.h
parent2e2d65cd10a9b2664d3ce020ef7e7e4de3d6705a (diff)
parent244bef7d0cdb75f011f70d8cd834154eeb469088 (diff)
Merge with default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/llui/llnotifications.h')
-rw-r--r--indra/llui/llnotifications.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h
index aeb4cebf1b..d55e0f4043 100644
--- a/indra/llui/llnotifications.h
+++ b/indra/llui/llnotifications.h
@@ -371,7 +371,7 @@ private:
// this is just for making it easy to look things up in a set organized by UUID -- DON'T USE IT
// for anything real!
- LLNotification(LLUUID uuid) : mId(uuid) {}
+ LLNotification(LLUUID uuid) : mId(uuid), mCancelled(false), mRespondedTo(false), mIgnored(false), mTemporaryResponder(false) {}
void cancel();
@@ -621,7 +621,7 @@ namespace LLNotificationComparators
struct orderBy
{
typedef boost::function<T (LLNotificationPtr)> field_t;
- orderBy(field_t field, EDirection = ORDER_INCREASING) : mField(field) {}
+ orderBy(field_t field, EDirection direction = ORDER_INCREASING) : mField(field), mDirection(direction) {}
bool operator()(LLNotificationPtr lhs, LLNotificationPtr rhs)
{
if (mDirection == ORDER_DECREASING)