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/llimview.h | |
| parent | 24c7e08b4038e77792e4eca318c00bcc80138d7e (diff) | |
| parent | f752b73cb2c18521765760bb7986816ee7b94056 (diff) | |
PE merge.
Diffstat (limited to 'indra/newview/llimview.h')
| -rw-r--r-- | indra/newview/llimview.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index ad6cede727..e7404074e0 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -66,7 +66,7 @@ public: void sessionInitReplyReceived(const LLUUID& new_session_id); void addMessagesFromHistory(const std::list<LLSD>& history); - void addMessage(const std::string& from, const LLUUID& from_id, const std::string& utf8_text, const std::string& time); + void addMessage(const std::string& from, const LLUUID& from_id, const std::string& utf8_text, const std::string& time, const bool is_history = false); void onVoiceChannelStateChanged(const LLVoiceChannel::EState& old_state, const LLVoiceChannel::EState& new_state, const LLVoiceChannel::EDirection& direction); /** @deprecated */ |