diff options
author | skolb <none@none> | 2009-10-23 15:34:15 -0700 |
---|---|---|
committer | skolb <none@none> | 2009-10-23 15:34:15 -0700 |
commit | 2b69cb9e9cf5209a8156580b74e6662e4cc4243f (patch) | |
tree | f38805b6ca5b60e8c0130259865dc610eaee7a0b /indra/newview/llimview.h | |
parent | 913786a62b2b8d8e6d9c483ea805a21e694fd818 (diff) | |
parent | 4ddaa866dde7a92e56617a32464e0667de3759ef (diff) |
Merged change to auto play pref (DEV-41787)
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 f9db6d8ed2..68beb29034 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -110,7 +110,7 @@ public: std::list<LLSD> getMessages(LLUUID session_id, int start_index = 0); bool addMessage(LLUUID session_id, std::string from, LLUUID other_participant_id, std::string utf8_text, bool log2file = true); - bool addToHistory(LLUUID session_id, std::string from, std::string utf8_text); + bool addToHistory(LLUUID session_id, std::string from, LLUUID from_id, std::string utf8_text); bool logToFile(const LLUUID& session_id, const std::string& from, const std::string& utf8_text); |