summaryrefslogtreecommitdiff
path: root/indra/newview/lllogchat.h
diff options
context:
space:
mode:
authorPaul ProductEngine <pguslisty@productengine.com>2012-08-28 14:48:32 +0300
committerPaul ProductEngine <pguslisty@productengine.com>2012-08-28 14:48:32 +0300
commitd4ee17e533d652e90989e60bcbc097c81e73d081 (patch)
treed1782ac876502d12455e8bff3981ba60aae3737e /indra/newview/lllogchat.h
parenta1a1410d25c3e4ff87e33344b416b7a827cdb1c2 (diff)
CHUI-275 FIXED (Chat history viewer does not show entire user.txt IM log file)
- Renamed LLLogChat::loadAllHistory to LLLogChat::loadChatHistory because it doesn't actually loads all history. Also added parameter to the function which is a flag whether to load all file's content or not. - Implemented displaying history by pages (as was decided on meeting page): Added showHistory() method to the LLFloaterConversationPreview which shows the chat history page by page starting from the last conversation (or may say starting from the last page). One page contains 100 entries. Added "More history..." button to display next page of history.
Diffstat (limited to 'indra/newview/lllogchat.h')
-rw-r--r--indra/newview/lllogchat.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lllogchat.h b/indra/newview/lllogchat.h
index 27752452c9..95f83e64e5 100644
--- a/indra/newview/lllogchat.h
+++ b/indra/newview/lllogchat.h
@@ -50,12 +50,12 @@ public:
const LLUUID& from_id,
const std::string& line);
- /** @deprecated @see loadAllHistory() */
+ /** @deprecated @see loadChatHistory() */
static void loadHistory(const std::string& filename,
void (*callback)(ELogLineType, const LLSD&, void*),
void* userdata);
- static void loadAllHistory(const std::string& file_name, std::list<LLSD>& messages);
+ static void loadChatHistory(const std::string& file_name, std::list<LLSD>& messages, bool load_all_history = false);
private:
static std::string cleanFileName(std::string filename);
};