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

CHUI-172 WIP Fixed drawing the nearby chat toast contents. 

Fixed warnings when creating a nearby chat toast.
master
Seth ProductEngine 2012-07-02 17:46:34 +03:00
parent cd7d499ea7
commit f22e5df8b6
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llchatitemscontainerctrl.cpp
View File

@ -96,8 +96,15 @@ void LLNearbyChatToastPanel::reshape (S32 width, S32 height, BOOL called_from_p
{
LLPanel::reshape(width, height,called_from_parent);
LLUICtrl* msg_text = getChild<LLUICtrl>("msg_text", false);
LLUICtrl* icon = getChild<LLUICtrl>("avatar_icon", false);
// reshape() may be called from LLView::initFromParams() before the children are created.
// We call findChild() instead of getChild() here to avoid creating dummy controls.
LLUICtrl* msg_text = findChild<LLUICtrl>("msg_text", false);
LLUICtrl* icon = findChild<LLUICtrl>("avatar_icon", false);
if (!msg_text || !icon)
{
return;
}
LLRect msg_text_rect = msg_text->getRect();
LLRect avatar_rect = icon->getRect();
@ -355,6 +362,8 @@ BOOL LLNearbyChatToastPanel::handleRightMouseDown(S32 x, S32 y, MASK mask)
}
void LLNearbyChatToastPanel::draw()
{
LLPanel::draw();
if(mIsDirty)
{
LLAvatarIconCtrl* icon = getChild<LLAvatarIconCtrl>("avatar_icon", false);