livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge fix: Allow threaded history loading in conversation preview

meow-7.2.2
Cinders 2013-08-28 15:19:10 -06:00
parent b428e50b99
commit edc1127dbd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llfloaterconversationpreview.cpp
View File

@ -60,10 +60,10 @@ LLFloaterConversationPreview::LLFloaterConversationPreview(const LLSD& session_i
BOOL LLFloaterConversationPreview::postBuild()
{
// <FS:CR> [FS communication UI]
//mChatHistory = getChild<LLChatHistory>("chat_history");
//LLLoadHistoryThread::setLoadEndSignal(boost::bind(&LLFloaterConversationPreview::SetPages, this, _1, _2)); <FS:TM> 3.6.4 check this, LL added
//mChatHistory = getChild<LLChatHistory>("chat_history");
mChatHistory = getChild<FSChatHistory>("chat_history");
// <FS:CR> [FS communication UI]
LLLoadHistoryThread::setLoadEndSignal(boost::bind(&LLFloaterConversationPreview::SetPages, this, _1, _2));
childSetAction("open_external_btn", boost::bind(&LLFloaterConversationPreview::onBtnOpenExternal, this)); //<FS:CR> Open chat history externally

2
indra/newview/llfloaterconversationpreview.h
View File

@ -68,7 +68,7 @@ private:
std::string mAccountName;
std::string mCompleteName;
std::string mChatHistoryFileName;
bool mChatHistoryLoaded; //<FS:TM> 3.6.4 check this, LL added this and line above, we added below
bool mChatHistoryLoaded;
};
#endif /* LLFLOATERCONVERSATIONPREVIEW_H_ */