summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--indra/newview/llpanelprofile.cpp2
-rw-r--r--indra/newview/skins/default/xui/en/panel_profile_firstlife.xml15
-rw-r--r--indra/newview/skins/default/xui/en/panel_profile_secondlife.xml95
3 files changed, 30 insertions, 82 deletions
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index 94169fd06f..fea76f9d04 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -488,7 +488,7 @@ void LLPanelProfileSecondLife::fillCommonData(const LLAvatarData* avatar_data)
void LLPanelProfileSecondLife::fillPartnerData(const LLAvatarData* avatar_data)
{
- LLTextBox* partner_text = getChild<LLTextBox>("partner_text");
+ LLTextEditor* partner_text = getChild<LLTextEditor>("partner_text");
if (avatar_data->partner_id.notNull())
{
partner_text->setText(LLSLURL("agent", avatar_data->partner_id, "inspect").getSLURLString());
diff --git a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
index 328f9a87b4..f9b6f5c62a 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
@@ -32,26 +32,17 @@
default_image_name="None"
fallback_image="Generic_Person_Large"
/>
- <view_border
- name="info_border"
- top="225"
- left="6"
- right="-6"
- height="185"
- follows="all"
- layout="topleft"
- bevel_style="in"
- />
<text_editor
name="fl_description_edit"
enabled="false"
- top_delta="1"
- left_delta="1"
+ top="225"
+ left="6"
right="-7"
height="183"
follows="all"
layout="topleft"
bg_readonly_color="Transparent"
+ border_visible="true"
max_length="253"
parse_urls="true"
word_wrap="true"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index ad9448f457..27d09386b9 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -22,6 +22,8 @@
<string
name="CaptionTextAcctInfo"
>
+ [ACCTTYPE]
+[PAYMENTINFO]
</string>
<string
name="payment_update_link_url"
@@ -76,11 +78,6 @@
name="FSGW"
value=" Gateway"
/>
- <!--
-
-KC: Use view_border's around text_editor's due to text render issues with border_visible
-
--->
<loading_indicator
name="progress_indicator"
top="4"
@@ -115,28 +112,19 @@ KC: Use view_border's around text_editor's due to text render issues with border
layout="topleft"
visible="false"
/>
- <view_border
- name="info_border"
- left_pad="4"
- right="-6"
- height="20"
- follows="left|top|right"
- layout="topleft"
- bevel_style="in"
- />
<text_editor
name="complete_name"
value="(loading...)"
enabled="false"
top_delta="0"
- left_delta="3"
+ left_pad="4"
right="-6"
height="20"
follows="left|top|right"
layout="topleft"
allow_scroll="false"
bg_visible="false"
- border_visible="false"
+ border_visible="true"
h_pad="1"
v_pad="2"
max_length="254"
@@ -175,19 +163,10 @@ KC: Use view_border's around text_editor's due to text render issues with border
follows="top|left"
layout="topleft"
/>
- <view_border
- name="info_border3"
- top_pad="0"
- right="-6"
- height="16"
- follows="top|left|right"
- layout="topleft"
- bevel_style="in"
- />
<text_editor
name="register_date"
value="(loading...)"
- top_delta="0"
+ top_pad="0"
left_delta="2"
right="-6"
height="16"
@@ -195,37 +174,27 @@ KC: Use view_border's around text_editor's due to text render issues with border
layout="topleft"
allow_scroll="false"
bg_visible="false"
- border_visible="false"
+ border_visible="true"
h_pad="2"
max_length="254"
read_only="true"
translate="false"
- v_pad="0"
+ v_pad="2"
word_wrap="true"
/>
<text
name="label2"
value="Account:"
- top_pad="6"
+ top_pad="5"
left_delta="-2"
right="-6"
height="16"
follows="top|left"
layout="topleft"
/>
- <view_border
- name="acct_border"
- top_pad="0"
- left_delta="0"
- right="-6"
- height="48"
- follows="top|left|right"
- layout="topleft"
- bevel_style="in"
- />
<text_editor
name="acc_status_text"
- top_delta="0"
+ top_pad="0"
left_delta="2"
right="-6"
height="44"
@@ -233,41 +202,39 @@ KC: Use view_border's around text_editor's due to text render issues with border
layout="topleft"
allow_scroll="false"
bg_visible="false"
- border_visible="false"
+ border_visible="true"
h_pad="2"
read_only="true"
translate="false"
- v_pad="0"
+ v_pad="2"
word_wrap="true"
/>
<text
name="partner_label"
value="Partner:"
- top_pad="6"
+ top_pad="5"
left_delta="-2"
right="-6"
height="16"
follows="top|left"
layout="topleft"
/>
- <view_border
- name="info_border4"
+ <text_editor
+ name="partner_text"
top_pad="0"
left_delta="0"
right="-6"
- height="18"
- follows="top|left|right"
- layout="topleft"
- bevel_style="in"
- />
- <text
- name="partner_text"
- top_delta="2"
- left_delta="2"
- right="-6"
- height="16"
+ height="20"
follows="top|left|right"
layout="topleft"
+ allow_scroll="false"
+ bg_visible="false"
+ border_visible="true"
+ parse_urls="true"
+ h_pad="0"
+ read_only="true"
+ translate="false"
+ v_pad="2"
max_length="254"
/>
<text
@@ -316,27 +283,17 @@ KC: Use view_border's around text_editor's due to text render issues with border
layout="topleft"
halign="right"
/>
- <view_border
- name="info_border5"
- top_delta="0"
- left="66"
- right="-6"
- height="102"
- follows="all"
- layout="topleft"
- bevel_style="in"
- />
<text_editor
name="sl_description_edit"
enabled="false"
- top_delta="1"
- left_delta="1"
+ top_delta="0"
+ left="66"
right="-7"
height="100"
follows="all"
layout="topleft"
bg_readonly_color="Transparent"
- border_visible="false"
+ border_visible="true"
font="SansSerifSmall"
h_pad="2"
max_length="510"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 12:40:11 +0000