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

Fixed normal bug EXT - 5104 (Remove names from below Profile image in IM windows) 

- removed LLTextBox containing avatar name from IM control panel(panel_im_control_panel.xml) and corresponding code in LLPanelIMControlPanel
meow-7.2.2
Paul Guslisty pguslisty@productengine.com 2010-02-11 09:41:20 +02:00
parent 22dccc74a8
commit 0e035fd9b8
3 changed files with 1 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
indra/newview/llpanelimcontrolpanel.cpp
View File

@ -224,14 +224,6 @@ void LLPanelIMControlPanel::setSessionId(const LLUUID& session_id)
childSetEnabled("share_btn", FALSE);
childSetEnabled("teleport_btn", FALSE);
childSetEnabled("pay_btn", FALSE);
getChild<LLTextBox>("avatar_name")->setValue(im_session->mName);
getChild<LLTextBox>("avatar_name")->setToolTip(im_session->mName);
}
else
{
// If the participant is an avatar, fetch the currect name
gCacheName->get(mAvatarID, FALSE, boost::bind(&LLPanelIMControlPanel::nameUpdatedCallback, this, _1, _2, _3, _4));
}
}
@ -247,19 +239,6 @@ void LLPanelIMControlPanel::changed(U32 mask)
}
}
void LLPanelIMControlPanel::nameUpdatedCallback(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group)
{
if ( id == mAvatarID )
{
std::string avatar_name;
avatar_name.assign(first);
avatar_name.append(" ");
avatar_name.append(last);
getChild<LLTextBox>("avatar_name")->setValue(avatar_name);
getChild<LLTextBox>("avatar_name")->setToolTip(avatar_name);
}
}
LLPanelGroupControlPanel::LLPanelGroupControlPanel(const LLUUID& session_id):
mParticipantList(NULL)
{

3
indra/newview/llpanelimcontrolpanel.h
View File

@ -89,9 +89,6 @@ public:
// LLFriendObserver trigger
virtual void changed(U32 mask);
protected:
void nameUpdatedCallback(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group);
private:
void onViewProfileButtonClicked();
void onAddFriendButtonClicked();

11
indra/newview/skins/default/xui/en/panel_im_control_panel.xml
View File

@ -11,15 +11,6 @@
name="avatar_icon"
top="-5"
width="105"/>
<text
follows="top|left|right"
font="SansSerifLarge"
height="19"
layout="topleft"
name="avatar_name"
use_ellipses="true"
value="Unknown"
width="110" />
<layout_stack
mouse_opaque="false"
border_size="0"
@ -30,7 +21,7 @@
left="5"
name="button_stack"
orientation="vertical"
top_pad="-5"
top_pad="5"
width="105">
<layout_panel
mouse_opaque="false"