diff options
author | CG Linden <cg@lindenlab.com> | 2010-01-26 13:44:24 -0800 |
---|---|---|
committer | CG Linden <cg@lindenlab.com> | 2010-01-26 13:44:24 -0800 |
commit | b8856efd5ff0e4899bb369dfd0815e824cd3a432 (patch) | |
tree | 4c99369867ed9e58b69dfad4ba8ee3a2e9a17b9b /indra/newview/lllogchat.cpp | |
parent | 5fc9d8bddad16b7d8dc6d481107a8ce690fdf731 (diff) | |
parent | fee564c26e1018787cf70b95fc677c1da447118c (diff) |
Pulled from viewer-2-0
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*/ |