summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2009-09-10 03:08:54 +0000
committerSteven Bennetts <steve@lindenlab.com>2009-09-10 03:08:54 +0000
commit44f294d484185ef3cb9f51e5cba6a3ee269b96dc (patch)
tree10405a76d776f22e2800abae93b04fd2aec6dddb /indra/newview/skins/default/xui/en
parentbbf497469c4d71d5308421f1ef06d0a2098772c8 (diff)
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1602 https://svn.aws.productengine.com/secondlife/pe/stable-2@1608 -> viewer-2.0.0-3
* Bugs: EXT-848 EXT-865 * New Dev: EXT-790 EXT-822
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/panel_people.xml1
-rw-r--r--indra/newview/skins/default/xui/en/panel_profile.xml13
2 files changed, 1 insertions, 13 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index e5a417e3d0..0af42bfc74 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -219,6 +219,7 @@
name="groups_panel"
width="285">
<group_list
+ draw_heading="false"
follows="left|top|right|bottom"
height="357"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 41de34fbed..580855e115 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -21,10 +21,6 @@
name="my_account_link_url"
value="http://secondlife.com/account" />
<string
- name="partner_edit_link_url">
- http://www.secondlife.com/account/partners.php?lang=en
- </string>
- <string
name="no_partner_text"
value="None" />
<scroll_container
@@ -217,15 +213,6 @@
top_pad="15"
value="Partner:"
width="100" />
- <text
- follows="left|top"
- height="15"
- layout="topleft"
- left_pad="10"
- name="partner_edit_link"
- top_delta="0"
- value="[[URL] Edit]"
- width="100" />
<panel
follows="left|top|right"
height="15"