summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-01-29 10:46:48 -0800
committerTofu Linden <tofu.linden@lindenlab.com>2010-01-29 10:46:48 -0800
commit1b5880a18ef82d79d8c60bcf2745baf80f3fa571 (patch)
treebc3cbb24193411f80469bd607dd14b31a6d5eee7
parent9459fd9137a2901f964bb307348b13d222c8287b (diff)
notifiaction_id -> notification_id
ouch.
-rw-r--r--indra/newview/llimfloater.cpp4
-rw-r--r--indra/newview/llnotificationhandlerutil.cpp2
2 files changed, 3 insertions, 3 deletions
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);