diff options
| author | PavelK ProductEngine <pkrivich@productengine.com> | 2013-12-03 19:32:56 +0200 |
|---|---|---|
| committer | PavelK ProductEngine <pkrivich@productengine.com> | 2013-12-03 19:32:56 +0200 |
| commit | 443c502ccc3abe50b7747fb2ba4d3b6bd74c1dc6 (patch) | |
| tree | 0df01c5c629662d1f928a89c2e1cc82a91276bfb /indra/newview/llfloaterconversationpreview.h | |
| parent | 21d9e524f64637cba6f96c21ff8a4bcf30afc961 (diff) | |
MAINT-3476 FIX Opening large chat histories from conversation log eats up huge amounts of memory, leading to viewer crash.
Diffstat (limited to 'indra/newview/llfloaterconversationpreview.h')
| -rwxr-xr-x | indra/newview/llfloaterconversationpreview.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/newview/llfloaterconversationpreview.h b/indra/newview/llfloaterconversationpreview.h index b0488f4ff1..a8dbbc9ffe 100755 --- a/indra/newview/llfloaterconversationpreview.h +++ b/indra/newview/llfloaterconversationpreview.h @@ -39,13 +39,14 @@ class LLFloaterConversationPreview : public LLFloater public: LLFloaterConversationPreview(const LLSD& session_id); - virtual ~LLFloaterConversationPreview(){}; + virtual ~LLFloaterConversationPreview(); virtual BOOL postBuild(); - void setPages(std::list<LLSD>& messages,const std::string& file_name); + void setPages(std::list<LLSD>* messages,const std::string& file_name); virtual void draw(); virtual void onOpen(const LLSD& key); + virtual void onClose(bool app_quitting); private: void onMoreHistoryBtnClick(); @@ -58,11 +59,13 @@ private: int mCurrentPage; int mPageSize; - std::list<LLSD> mMessages; + std::list<LLSD>* mMessages; std::string mAccountName; std::string mCompleteName; - std::string mChatHistoryFileName; + std::string mChatHistoryFileName; bool mShowHistory; + bool mHistoryThreadsBusy; + bool mOpened; }; #endif /* LLFLOATERCONVERSATIONPREVIEW_H_ */ |