summaryrefslogtreecommitdiff
path: root/indra/newview/llnotificationhandlerutil.cpp
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/newview/llnotificationhandlerutil.cpp
parent2e2d65cd10a9b2664d3ce020ef7e7e4de3d6705a (diff)
parent244bef7d0cdb75f011f70d8cd834154eeb469088 (diff)
Merge with default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llnotificationhandlerutil.cpp')
-rw-r--r--indra/newview/llnotificationhandlerutil.cpp2
1 files changed, 1 insertions, 1 deletions
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);