summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterconversationpreview.h
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-08-29 10:45:32 -0700
committerMerov Linden <merov@lindenlab.com>2012-08-29 10:45:32 -0700
commit01a154809d650f7905aaa208150a1070b19e5c2b (patch)
treef0dda921e97830d68e41553137459a3dbcca07b6 /indra/newview/llfloaterconversationpreview.h
parentca7abc4c3be9310f4e5fec00b7d6ffadaba58ff0 (diff)
parent051bc99573d7c571cea0e2e1df332c1e5e97ff19 (diff)
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llfloaterconversationpreview.h')
-rw-r--r--indra/newview/llfloaterconversationpreview.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llfloaterconversationpreview.h b/indra/newview/llfloaterconversationpreview.h
index cfc7c34485..5105ef3702 100644
--- a/indra/newview/llfloaterconversationpreview.h
+++ b/indra/newview/llfloaterconversationpreview.h
@@ -42,10 +42,15 @@ public:
virtual void onOpen(const LLSD& session_id);
private:
- void appendMessage(const LLChat& chat);
+ void onMoreHistoryBtnClick();
+ void showHistory();
LLChatHistory* mChatHistory;
LLUUID mSessionID;
+ int mCurrentPage;
+ int mPageSize;
+
+ std::list<LLSD> mMessages;
};
#endif /* LLFLOATERCONVERSATIONPREVIEW_H_ */