aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lleventnotifier.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/lleventnotifier.cpp')
-rw-r--r--linden/indra/newview/lleventnotifier.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/linden/indra/newview/lleventnotifier.cpp b/linden/indra/newview/lleventnotifier.cpp
index 9451667..e289a2b 100644
--- a/linden/indra/newview/lleventnotifier.cpp
+++ b/linden/indra/newview/lleventnotifier.cpp
@@ -68,7 +68,7 @@ void LLEventNotifier::update()
68 // Check our notifications again and send out updates 68 // Check our notifications again and send out updates
69 // if they happen. 69 // if they happen.
70 70
71 U32 alert_time = time_corrected() + 5 * 60; 71 time_t alert_time = time_corrected() + 5 * 60;
72 en_map::iterator iter; 72 en_map::iterator iter;
73 for (iter = mEventNotifications.begin(); 73 for (iter = mEventNotifications.begin();
74 iter != mEventNotifications.end();) 74 iter != mEventNotifications.end();)
@@ -77,7 +77,7 @@ void LLEventNotifier::update()
77 77
78 if (np->getEventDate() < (alert_time)) 78 if (np->getEventDate() < (alert_time))
79 { 79 {
80 LLString::format_map_t args; 80 LLStringUtil::format_map_t args;
81 args["[NAME]"] = np->getEventName(); 81 args["[NAME]"] = np->getEventName();
82 args["[DATE]"] = np->getEventDateStr(); 82 args["[DATE]"] = np->getEventDateStr();
83 LLNotifyBox::showXml("EventNotification", args, 83 LLNotifyBox::showXml("EventNotification", args,
@@ -203,7 +203,8 @@ void LLEventNotifier::notifyCallback(S32 option, void *user_data)
203 203
204LLEventNotification::LLEventNotification() : 204LLEventNotification::LLEventNotification() :
205 mEventID(0), 205 mEventID(0),
206 mEventName("") 206 mEventName(""),
207 mEventDate(0)
207{ 208{
208} 209}
209 210