From 1b5880a18ef82d79d8c60bcf2745baf80f3fa571 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 29 Jan 2010 10:46:48 -0800 Subject: notifiaction_id -> notification_id ouch. --- indra/newview/llimfloater.cpp | 4 ++-- indra/newview/llnotificationhandlerutil.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index c2bcb1cdf9..9e52d4c6c2 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -604,9 +604,9 @@ void LLIMFloater::updateMessages() chat.mTimeStr = time; // process offer notification - if (msg.has("notifiaction_id")) + if (msg.has("notification_id")) { - chat.mNotifId = msg["notifiaction_id"].asUUID(); + chat.mNotifId = msg["notification_id"].asUUID(); } //process text message else diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp index f9b3b7187a..16218f6d53 100644 --- a/indra/newview/llnotificationhandlerutil.cpp +++ b/indra/newview/llnotificationhandlerutil.cpp @@ -248,7 +248,7 @@ void LLHandlerUtil::addNotifPanelToIM(const LLNotificationPtr& notification) llassert_always(session != NULL); LLSD offer; - offer["notifiaction_id"] = notification->getID(); + offer["notification_id"] = notification->getID(); offer["from_id"] = notification->getPayload()["from_id"]; offer["from"] = name; offer["time"] = LLLogChat::timestamp(true); -- cgit v1.2.3