diff options
| -rw-r--r-- | indra/newview/llchathistory.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llpanelprofileview.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_chat_header.xml | 23 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_profile_view.xml | 7 |
4 files changed, 20 insertions, 16 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 4ce3b50ed5..a95234099c 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -34,6 +34,7 @@ #include "llchathistory.h" #include "llpanel.h" #include "lltextbox.h" +#include "lltexteditor.h" #include "lluictrlfactory.h" #include "llscrollcontainer.h" #include "llavatariconctrl.h" @@ -185,7 +186,7 @@ public: mSourceType = CHAT_SOURCE_SYSTEM; } - LLTextBox* userName = getChild<LLTextBox>("user_name"); + LLTextEditor* userName = getChild<LLTextEditor>("user_name"); LLUIColor color = style_params.color; userName->setReadOnlyColor(color); diff --git a/indra/newview/llpanelprofileview.cpp b/indra/newview/llpanelprofileview.cpp index d4ab5013f9..c7c2484be3 100644 --- a/indra/newview/llpanelprofileview.cpp +++ b/indra/newview/llpanelprofileview.cpp @@ -43,6 +43,7 @@ #include "llpanelpicks.h" #include "llpanelprofile.h" #include "llsidetraypanelcontainer.h" +#include "lltexteditor.h" static LLRegisterPanelClassWrapper<LLPanelProfileView> t_panel_target_profile("panel_profile_view"); @@ -190,7 +191,7 @@ void LLPanelProfileView::processOnlineStatus(bool online) void LLPanelProfileView::onAvatarNameCached(const LLUUID& id, const std::string& first_name, const std::string& last_name, BOOL is_group) { llassert(getAvatarId() == id); - getChild<LLTextBox>("user_name", FALSE)->setValue(first_name + " " + last_name); + getChild<LLTextEditor>("user_name", FALSE)->setValue(first_name + " " + last_name); } void LLPanelProfileView::togglePanel(LLPanel* panel) diff --git a/indra/newview/skins/default/xui/en/panel_chat_header.xml b/indra/newview/skins/default/xui/en/panel_chat_header.xml index 7a3eae35a9..da175a75cd 100644 --- a/indra/newview/skins/default/xui/en/panel_chat_header.xml +++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - background_visible="true" + background_visible="true" bevel_style="in" bg_alpha_color="black" follows="top|left|right" height="24" label="im_header" - layout="topleft" + layout="topleft" name="im_header" width="300"> - <avatar_icon + <avatar_icon follows="left" height="18" image_name="Generic_Person" @@ -19,18 +19,19 @@ name="avatar_icon" top="3" width="18" /> - <text + <text_editor + read_only = "true" follows="left|right" - font.style="BOLD" - height="12" - layout="topleft" - left_pad="5" + font.style="BOLD" + height="18" + layout="topleft" + left_pad="5" right="-50" name="user_name" text_color="white" - top="8" - use_ellipses="true" - value="Erica Vader" /> + top="5" + use_ellipses="true" + value="Erica Vader" /> <text font="SansSerifSmall" follows="right" diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml index b015346a79..8e683bffc1 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_view.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml @@ -25,10 +25,11 @@ tab_stop="false" top="2" width="23" /> - <text + <text_editor + read_only = "true" follows="top|left|right" font="SansSerifHugeBold" - height="26" + height="29" layout="topleft" left_pad="10" name="user_name" @@ -52,7 +53,7 @@ halign="center" layout="topleft" left="10" - min_width="333" + min_width="333" name="tabs" tab_min_width="80" tab_height="30" |