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

CHUI-464, CHUI-466, CHUI-474 : Fixed! Better, unified and more consistent use of refreshConversation() to update torn off dialogs.

meow-7.2.2
Merov Linden 2012-11-08 17:09:23 -08:00
parent 865cb1b967
commit 1d590cd5fd
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
indra/newview/llimconversation.cpp
View File

@ -51,7 +51,6 @@ LLIMConversation::LLIMConversation(const LLSD& session_id)
, mTearOffBtn(NULL)
, mCloseBtn(NULL)
, mSessionID(session_id.asUUID())
// , mParticipantList(NULL)
, mConversationsRoot(NULL)
, mChatHistory(NULL)
, mInputEditor(NULL)
@ -77,14 +76,6 @@ LLIMConversation::LLIMConversation(const LLSD& session_id)
LLIMConversation::~LLIMConversation()
{
/*
if (mParticipantList)
{
delete mParticipantList;
mParticipantList = NULL;
}
*/
delete mRefreshTimer;
}
@ -246,8 +237,6 @@ BOOL LLIMConversation::postBuild()
buildConversationViewParticipant();
updateHeaderAndToolbar();
mSaveRect = isTornOff();
initRectControl();
@ -264,6 +253,8 @@ BOOL LLIMConversation::postBuild()
result = LLDockableFloater::postBuild();
}
refreshConversation();
return result;
}
@ -274,8 +265,6 @@ LLParticipantList* LLIMConversation::getParticipantList()
void LLIMConversation::draw()
{
LLTransientDockableFloater::draw();
if (mRefreshTimer->hasExpired())
{
if (getParticipantList())
@ -283,12 +272,13 @@ void LLIMConversation::draw()
getParticipantList()->update();
}
refresh();
updateHeaderAndToolbar();
refreshConversation();
// Restart the refresh timer
mRefreshTimer->setTimerExpirySec(REFRESH_INTERVAL);
}
LLTransientDockableFloater::draw();
}
void LLIMConversation::enableDisableCallBtn()
@ -488,6 +478,8 @@ void LLIMConversation::refreshConversation()
mConversationViewModel.requestSortAll();
mConversationsRoot->arrangeAll();
mConversationsRoot->update();
updateHeaderAndToolbar();
refresh();
}
// Copied from LLIMFloaterContainer::createConversationViewParticipant(). Refactor opportunity!
@ -731,7 +723,6 @@ void LLIMConversation::onTearOffClicked()
mSaveRect = isTornOff();
initRectControl();
LLFloater::onClickTearOff(this);
updateHeaderAndToolbar();
refreshConversation();
}
@ -749,7 +740,7 @@ bool LLIMConversation::checkIfTornOff()
if (isTorn != isTornOff())
{
setTornOff(isTorn);
updateHeaderAndToolbar();
refreshConversation();
}
return isTorn;

1
indra/newview/llimconversation.h
View File

@ -142,7 +142,6 @@ protected:
LLUUID mSessionID;
LLLayoutPanel* mParticipantListPanel; // add the widgets to that see mConversationsListPanel
//LLParticipantList* mParticipantList; get this from the mConversationsItems for the moment
LLParticipantList* getParticipantList();
conversations_widgets_map mConversationsWidgets;
LLConversationViewModel mConversationViewModel;