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

Fix build for the CHUI conversation log 

TODO: Make them not ugly and hook them up to our communications ui
master
Cinders 2013-07-04 14:57:50 -06:00
parent 3a68360389
commit 3d32441dcc
13 changed files with 50 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/fschathistory.cpp
View File

@ -24,7 +24,7 @@
* $/LicenseInfo$
*/
// Original file: FSChatHistory.cpp
// Original file: LLChatHistory.cpp
#include "llviewerprecompiledheaders.h"

19
indra/newview/llconversationlog.cpp
View File

@ -25,14 +25,16 @@
#include "llviewerprecompiledheaders.h"
#if 0
#include "llagent.h"
#include "llavatarnamecache.h"
#include "llconversationlog.h"
#include "lldiriterator.h"
#include "llnotificationsutil.h"
#include "lltrans.h"
// <FS:CR>
#include "llviewercontrol.h"
#include "fsfloaterim.h"
// </FS:CR>
#include <boost/foreach.hpp>
#include "boost/lexical_cast.hpp"
@ -147,15 +149,20 @@ bool LLConversation::isOlderThan(U32 days) const
void LLConversation::setListenIMFloaterOpened()
{
LLFloaterIMSession* floater = LLFloaterIMSession::findInstance(mSessionID);
// <FS:CR>
//LLFloaterIMSession* floater = LLFloaterIMSession::findInstance(mSessionID);
FSFloaterIM* floater = FSFloaterIM::findInstance(mSessionID);
bool offline_ims_visible = LLFloaterIMSession::isVisible(floater) && floater->hasFocus();
//bool offline_ims_visible = LLFloaterIMSession::isVisible(floater) && floater->hasFocus();
bool offline_ims_visible = FSFloaterIM::isVisible(floater) && floater->hasFocus();
// </FS:CR>
// we don't need to listen for im floater with this conversation is opened
// if floater is already opened or this conversation doesn't have unread offline messages
if (mHasOfflineIMs && !offline_ims_visible)
{
mIMFloaterShowedConnection = LLFloaterIMSession::setIMFloaterShowedCallback(boost::bind(&LLConversation::onIMFloaterShown, this, _1));
// FIXME: I commented this out until it's hooked up <FS:CR>
//mIMFloaterShowedConnection = LLFloaterIMSession::setIMFloaterShowedCallback(boost::bind(&LLConversation::onIMFloaterShown, this, _1));
}
else
{
@ -615,5 +622,3 @@ void LLConversationLog::onClearLogResponse(const LLSD& notification, const LLSD&
deleteBackupLogs();
}
}
#endif

4
indra/newview/llconversationlog.h
View File

@ -23,8 +23,6 @@
* $/LicenseInfo$
*/
#if 0
#ifndef LLCONVERSATIONLOG_H_
#define LLCONVERSATIONLOG_H_
@ -216,5 +214,3 @@ public:
};
#endif /* LLCONVERSATIONLOG_H_ */
#endif

5
indra/newview/llconversationloglist.cpp
View File

@ -25,8 +25,6 @@
#include "llviewerprecompiledheaders.h"
#if 0
#include "llavataractions.h"
#include "llagent.h"
#include "llfloaterreg.h"
@ -36,6 +34,7 @@
#include "llconversationloglistitem.h"
#include "llviewermenu.h"
#include "lltrans.h"
#include "llviewercontrol.h" // <FS:CR>
static LLDefaultChildRegistry::Register<LLConversationLogList> r("conversation_log_list");
@ -533,5 +532,3 @@ bool LLConversationLogListDateComparator::doCompare(const LLConversationLogListI
return date1 > date2;
}
#endif

4
indra/newview/llconversationloglist.h
View File

@ -23,8 +23,6 @@
* $/LicenseInfo$
*/
if 0
#ifndef LLCONVERSATIONLOGLIST_H_
#define LLCONVERSATIONLOGLIST_H_
@ -153,5 +151,3 @@ protected:
};
#endif /* LLCONVERSATIONLOGLIST_H_ */
#endif

17
indra/newview/llconversationloglistitem.cpp
View File

@ -25,12 +25,11 @@
#include "llviewerprecompiledheaders.h"
#if 0
// llui
#include "lliconctrl.h"
#include "lltextbox.h"
#include "lltextutil.h"
#include "llbutton.h" // <FS:CR>
// newview
#include "llavataractions.h"
@ -49,13 +48,17 @@ LLConversationLogListItem::LLConversationLogListItem(const LLConversation* conve
{
buildFromFile("panel_conversation_log_list_item.xml");
LLFloaterIMSession* floater = LLFloaterIMSession::findInstance(mConversation->getSessionID());
bool ims_are_read = LLFloaterIMSession::isVisible(floater) && floater->hasFocus();
// <FS:CR>
//LLFloaterIMSession* floater = LLFloaterIMSession::findInstance(mConversation->getSessionID());
FSFloaterIM* floater = FSFloaterIM::findInstance(mConversation->getSessionID());
//bool ims_are_read = LLFloaterIMSession::isVisible(floater) && floater->hasFocus();
bool ims_are_read = FSFloaterIM::isVisible(floater) && floater->hasFocus();
// </FS:CR>
if (mConversation->hasOfflineMessages() && !ims_are_read)
{
mIMFloaterShowedConnection = LLFloaterIMSession::setIMFloaterShowedCallback(boost::bind(&LLConversationLogListItem::onIMFloaterShown, this, _1));
// FIXME: Commented this out cuz I'm lazy. <FS:CR>
//mIMFloaterShowedConnection = LLFloaterIMSession::setIMFloaterShowedCallback(boost::bind(&LLConversationLogListItem::onIMFloaterShown, this, _1));
}
}
@ -184,5 +187,3 @@ void LLConversationLogListItem::onDoubleClick()
break;
}
}
#endif

5
indra/newview/llconversationloglistitem.h
View File

@ -26,7 +26,10 @@
#ifndef LLCONVERSATIONLOGLISTITEM_H_
#define LLCONVERSATIONLOGLISTITEM_H_
#include "llfloaterimsession.h"
// <FS:CR>
//#include "llfloaterimsession.h"
#include "fsfloaterim.h"
// </FS:CR>
#include "llpanel.h"
class LLTextBox;

5
indra/newview/llfloaterconversationlog.cpp
View File

@ -25,13 +25,12 @@
*/
#include "llviewerprecompiledheaders.h"
#if 0
#include "llconversationloglist.h"
#include "llfiltereditor.h"
#include "llfloaterconversationlog.h"
#include "llfloaterreg.h"
#include "llmenubutton.h"
#include "llviewercontrol.h" // <FS:CR>
LLFloaterConversationLog::LLFloaterConversationLog(const LLSD& key)
: LLFloater(key),
@ -133,5 +132,3 @@ bool LLFloaterConversationLog::isActionChecked(const LLSD& userdata)
return false;
}
#endif

4
indra/newview/llfloaterconversationlog.h
View File

@ -23,8 +23,6 @@
* $/LicenseInfo$
*/
#if 0
#ifndef LL_LLFLOATERCONVERSATIONLOG_H_
#define LL_LLFLOATERCONVERSATIONLOG_H_
@ -56,5 +54,3 @@ private:
#endif /* LLFLOATERCONVERSATIONLOG_H_ */
#endif

18
indra/newview/llfloaterconversationpreview.cpp
View File

@ -25,15 +25,17 @@
#include "llviewerprecompiledheaders.h"
#if 0
#include "llconversationlog.h"
#include "llfloaterconversationpreview.h"
#include "llimview.h"
#include "lllineeditor.h"
#include "llfloaterimnearbychat.h"
// <FS:CR>
//#include "llfloaterimnearbychat.h"
#include "fsfloaternearbychat.h"
// </FS:CR>
#include "llspinctrl.h"
#include "lltrans.h"
#include "llviewercontrol.h" // <FS:CR>
const std::string LL_FCP_COMPLETE_NAME("complete_name");
const std::string LL_FCP_ACCOUNT_NAME("user_name");
@ -51,7 +53,10 @@ LLFloaterConversationPreview::LLFloaterConversationPreview(const LLSD& session_i
BOOL LLFloaterConversationPreview::postBuild()
{
mChatHistory = getChild<LLChatHistory>("chat_history");
// <FS:CR>
//mChatHistory = getChild<LLChatHistory>("chat_history");
mChatHistory = getChild<FSChatHistory>("chat_history");
// <FS:CR>
const LLConversation* conv = LLConversationLog::instance().getConversation(mSessionID);
std::string name;
@ -162,7 +167,8 @@ void LLFloaterConversationPreview::showHistory()
}
else if (from_id.isNull())
{
chat.mSourceType = LLFloaterIMNearbyChat::isWordsName(from) ? CHAT_SOURCE_UNKNOWN : CHAT_SOURCE_OBJECT;
// FIXME: Hook this up to our nearby chat <FS:CR>
//chat.mSourceType = LLFloaterIMNearbyChat::isWordsName(from) ? CHAT_SOURCE_UNKNOWN : CHAT_SOURCE_OBJECT;
}
LLSD chat_args;
@ -186,5 +192,3 @@ void LLFloaterConversationPreview::onMoreHistoryBtnClick()
showHistory();
}
#endif

15
indra/newview/llfloaterconversationpreview.h
View File

@ -22,14 +22,14 @@
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
//<FS:TM> CHUI Merge this file doesnt exsist in LL's repo
#if 0
#ifndef LLFLOATERCONVERSATIONPREVIEW_H_
#define LLFLOATERCONVERSATIONPREVIEW_H_
#include "llchathistory.h"
// <FS:CR>
//#include "llchathistory.h"
#include "fschathistory.h"
// </FS:CR>
#include "llfloater.h"
extern const std::string LL_FCP_COMPLETE_NAME; //"complete_name"
@ -54,7 +54,10 @@ private:
void showHistory();
LLSpinCtrl* mPageSpinner;
LLChatHistory* mChatHistory;
// <FS:CR>
//LLChatHistory* mChatHistory;
FSChatHistory* mChatHistory;
// </FS:CR>
LLUUID mSessionID;
int mCurrentPage;
int mPageSize;
@ -65,5 +68,3 @@ private:
};
#endif /* LLFLOATERCONVERSATIONPREVIEW_H_ */
#endif

4
indra/newview/llviewerfloaterreg.cpp
View File

@ -237,7 +237,7 @@ void LLViewerFloaterReg::registerFloaters()
// </FS:Ansariel> [FS communication UI]
LLFloaterReg::add("compile_queue", "floater_script_queue.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterCompileQueue>);
// <FS:Ansariel> [FS communication UI]
//LLFloaterReg::add("conversation", "floater_conversation_log.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterConversationLog>);
LLFloaterReg::add("conversation", "floater_conversation_log.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterConversationLog>);
// </FS:Ansariel> [FS communication UI]
@ -320,7 +320,7 @@ void LLViewerFloaterReg::registerFloaters()
LLFloaterReg::add("picks", "floater_picks.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSidePanelContainer>);
LLFloaterReg::add("pref_joystick", "floater_joystick.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterJoystick>);
LLFloaterReg::add("preview_anim", "floater_preview_animation.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPreviewAnim>, "preview");
//LLFloaterReg::add("preview_conversation", "floater_conversation_preview.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterConversationPreview>); [CHUI Merge]
LLFloaterReg::add("preview_conversation", "floater_conversation_preview.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterConversationPreview>);
LLFloaterReg::add("preview_gesture", "floater_preview_gesture.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPreviewGesture>, "preview");
LLFloaterReg::add("preview_notecard", "floater_preview_notecard.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPreviewNotecard>, "preview");
LLFloaterReg::add("preview_script", "floater_script_preview.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPreviewLSL>, "preview");

2
indra/newview/skins/default/xui/en/floater_conversation_log.xml
View File

@ -12,7 +12,7 @@
save_rect="true"
single_instance="true"
reuse_instance="true"
title="CONVERSATION LOG"
title="Conversation Log"
width="300">
<panel
follows="left|top|right"