diff options
| author | Cho <cho@lindenlab.com> | 2013-01-25 22:56:35 +0000 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2013-01-25 22:56:35 +0000 |
| commit | 427725c2a6d5c50468e7579a4d3b92795425723f (patch) | |
| tree | 59def37a836e261e1c1a7027a450e59785f25fc3 /indra/newview/llimview.cpp | |
| parent | 9312cd8709132835878bdbe17f81d1b3e9fa7f45 (diff) | |
| parent | daa9db305a5ae2c0c5b0c2425d6482de6dee7b2c (diff) | |
merging latest changes
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index d0a8dfc0c8..cb03c1d234 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -144,7 +144,7 @@ static void on_avatar_name_cache_toast(const LLUUID& agent_id, args["FROM"] = av_name.getCompleteName(); args["FROM_ID"] = msg["from_id"]; args["SESSION_ID"] = msg["session_id"]; - LLNotificationsUtil::add("IMToast", args, LLSD(), boost::bind(&LLFloaterIMContainer::showConversation, LLFloaterIMContainer::getInstance(), msg["session_id"].asUUID())); + LLNotificationsUtil::add("IMToast", args, args, boost::bind(&LLFloaterIMContainer::showConversation, LLFloaterIMContainer::getInstance(), msg["session_id"].asUUID())); } void on_new_message(const LLSD& msg) |