diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-02-01 13:10:45 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-02-01 13:10:45 +0200 |
| commit | b3641c35fe00ea93887ea8980bf69624c8299267 (patch) | |
| tree | 9b575e425986b3f0496192e95009ba2297158de3 /indra/newview/llimfloater.cpp | |
| parent | 2e2d65cd10a9b2664d3ce020ef7e7e4de3d6705a (diff) | |
| parent | 244bef7d0cdb75f011f70d8cd834154eeb469088 (diff) | |
Merge with default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llimfloater.cpp')
| -rw-r--r-- | indra/newview/llimfloater.cpp | 4 |
1 files changed, 2 insertions, 2 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 |