diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-08-29 10:45:32 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-08-29 10:45:32 -0700 |
| commit | 01a154809d650f7905aaa208150a1070b19e5c2b (patch) | |
| tree | f0dda921e97830d68e41553137459a3dbcca07b6 /indra/newview/lllogchat.cpp | |
| parent | ca7abc4c3be9310f4e5fec00b7d6ffadaba58ff0 (diff) | |
| parent | 051bc99573d7c571cea0e2e1df332c1e5e97ff19 (diff) | |
Pull merge from richard/viewer-chui
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 ebb5912ace..073f5f00c5 100644 --- a/indra/newview/lllogchat.cpp +++ b/indra/newview/lllogchat.cpp @@ -387,7 +387,7 @@ void append_to_last_message(std::list<LLSD>& messages, const std::string& line) } // static -void LLLogChat::loadAllHistory(const std::string& file_name, std::list<LLSD>& messages) +void LLLogChat::loadChatHistory(const std::string& file_name, std::list<LLSD>& messages, bool load_all_history/*= false*/) { if (file_name.empty()) { @@ -412,8 +412,8 @@ void LLLogChat::loadAllHistory(const std::string& file_name, std::list<LLSD>& me S32 len; bool firstline = TRUE; - if (fseek(fptr, (LOG_RECALL_SIZE - 1) * -1 , SEEK_END)) - { //File is smaller than recall size. Get it all. + if (load_all_history || fseek(fptr, (LOG_RECALL_SIZE - 1) * -1 , SEEK_END)) + { //We need to load the whole historyFile or it's smaller than recall size, so get it all. firstline = FALSE; if (fseek(fptr, 0, SEEK_SET)) { |