diff options
| author | dmitrykproductengine <none@none> | 2013-09-10 10:34:20 +0300 |
|---|---|---|
| committer | dmitrykproductengine <none@none> | 2013-09-10 10:34:20 +0300 |
| commit | d995782edf1a55c327ad3f3349bd9d4b6ec3d9e6 (patch) | |
| tree | 5cfbe3ad66d5dbffdace56a4de2d0b95f894fdb6 /indra/newview/llfloaterconversationpreview.h | |
| parent | 6198219d9da6e069804d57ca9a3e711341a4c2e0 (diff) | |
MAINT-3117 FIXED crash in LLFloaterConversationPreview::showHistory()
Updated fix with a more complex and stable version. Integrated solution from the CHUI-836.
Diffstat (limited to 'indra/newview/llfloaterconversationpreview.h')
| -rwxr-xr-x | indra/newview/llfloaterconversationpreview.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloaterconversationpreview.h b/indra/newview/llfloaterconversationpreview.h index 389f3dfd09..f8796127ba 100755 --- a/indra/newview/llfloaterconversationpreview.h +++ b/indra/newview/llfloaterconversationpreview.h @@ -42,7 +42,7 @@ public: 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); @@ -51,6 +51,7 @@ private: void onMoreHistoryBtnClick(); void showHistory(); + LLMutex mMutex; LLSpinCtrl* mPageSpinner; LLChatHistory* mChatHistory; LLUUID mSessionID; |