diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-19 13:08:10 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-19 13:08:10 +0000 |
| commit | c3a71b7dcbfe855058a84e22651aea3910133aa1 (patch) | |
| tree | c2682496dee4a394f91a4ccc7ddcf3159f5cb0ae /indra/newview/llimfloater.cpp | |
| parent | 24c7e08b4038e77792e4eca318c00bcc80138d7e (diff) | |
| parent | f752b73cb2c18521765760bb7986816ee7b94056 (diff) | |
PE merge.
Diffstat (limited to 'indra/newview/llimfloater.cpp')
| -rw-r--r-- | indra/newview/llimfloater.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 847695577a..9c0e7a158d 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -633,12 +633,14 @@ void LLIMFloater::updateMessages() LLUUID from_id = msg["from_id"].asUUID(); std::string from = msg["from"].asString(); std::string message = msg["message"].asString(); + bool is_history = msg["is_history"].asBoolean(); LLChat chat; chat.mFromID = from_id; chat.mSessionID = mSessionID; chat.mFromName = from; chat.mTimeStr = time; + chat.mChatStyle = is_history ? CHAT_STYLE_HISTORY : chat.mChatStyle; // process offer notification if (msg.has("notification_id")) |