diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-22 10:51:58 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-22 10:51:58 -0800 |
| commit | 3889d4329962cc497bccbc8bbe9e6678ab3c9e6c (patch) | |
| tree | da02c07350e9c4def5013376dbbc382a3e49d57e /indra/newview/lllogchat.cpp | |
| parent | fa891c062ef66410123c66de1ef67b7dcef327db (diff) | |
| parent | 09e9cdeb2e7e979ea1d4898fa7c2d40e8ebc52b2 (diff) | |
PE merge.
Diffstat (limited to 'indra/newview/lllogchat.cpp')
| -rw-r--r-- | indra/newview/lllogchat.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp index 4e5aaeb66a..dc187bf36c 100644 --- a/indra/newview/lllogchat.cpp +++ b/indra/newview/lllogchat.cpp @@ -237,15 +237,15 @@ void append_to_last_message(std::list<LLSD>& messages, const std::string& line) messages.back()[IM_TEXT] = im_text; } -void LLLogChat::loadAllHistory(const std::string& session_name, std::list<LLSD>& messages) +void LLLogChat::loadAllHistory(const std::string& file_name, std::list<LLSD>& messages) { - if (session_name.empty()) + if (file_name.empty()) { llwarns << "Session name is Empty!" << llendl; return ; } - LLFILE* fptr = LLFile::fopen(makeLogFileName(session_name), "r"); /*Flawfinder: ignore*/ + LLFILE* fptr = LLFile::fopen(makeLogFileName(file_name), "r"); /*Flawfinder: ignore*/ if (!fptr) return; //No previous conversation with this name. char buffer[LOG_RECALL_SIZE]; /*Flawfinder: ignore*/ |