From 0e035fd9b8090c59cc7388809ebe0bf25b54cd9d Mon Sep 17 00:00:00 2001
From: "Paul Guslisty pguslisty@productengine.com"
<Paul Guslisty pguslisty@productengine.com>
Date: Thu, 11 Feb 2010 09:41:20 +0200
Subject: [PATCH] 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
---
indra/newview/llpanelimcontrolpanel.cpp | 21 -------------------
indra/newview/llpanelimcontrolpanel.h | 3 ---
.../default/xui/en/panel_im_control_panel.xml | 11 +---------
3 files changed, 1 insertion(+), 34 deletions(-)
diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp
index cbd6f64a485..8e305a56748 100644
--- a/indra/newview/llpanelimcontrolpanel.cpp
+++ b/indra/newview/llpanelimcontrolpanel.cpp
@@ -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)
{
diff --git a/indra/newview/llpanelimcontrolpanel.h b/indra/newview/llpanelimcontrolpanel.h
index 3ab505a084d..ce8fc58e560 100644
--- a/indra/newview/llpanelimcontrolpanel.h
+++ b/indra/newview/llpanelimcontrolpanel.h
@@ -89,9 +89,6 @@ class LLPanelIMControlPanel : public LLPanelChatControlPanel, LLFriendObserver
// 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();
diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
index c7e5b25e062..28c4adf67cf 100644
--- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
@@ -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"
--
GitLab