From ba320f7ca4957d7a8444df95211711a07055d2e1 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Tue, 12 Jan 2010 13:24:33 +0200
Subject: Fix for major bug EXT-4147 - Cannot click on Urls in
 LLExpandableTextBox objects.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_my_profile.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_my_profile.xml')

diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml
index 8327edfdd0..5a023dab97 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -62,10 +62,11 @@
           <panel
                 layout="topleft"
           follows="left|top|right"
+                height="505"
                name="scroll_content_panel"
                 top="0"
                 left="0"
-                width="303">
+                width="297">
             <panel
                   follows="left|top|right"
                   height="117"
@@ -73,7 +74,7 @@
                   left="10"
                   name="second_life_image_panel"
                   top="0"
-                  width="300">
+                  width="297">
               <texture_picker
                allow_no_texture="true"
                default_image_name="None"
@@ -114,7 +115,7 @@
                textbox.max_length="512"
                name="sl_description_edit"
                top_pad="-3"
-               width="188"
+               width="181"
                expanded_bg_visible="true"
                expanded_bg_color="DkGray">
                 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
@@ -127,7 +128,7 @@
        top_pad="10"
              left="10"
              name="first_life_image_panel"
-             width="300">
+             width="297">
               <texture_picker
                allow_no_texture="true"
                default_image_name="None"
@@ -167,7 +168,7 @@
                textbox.max_length="512"
                name="fl_description_edit"
                top_pad="-3"
-               width="188"
+               width="181"
                expanded_bg_visible="true"
                expanded_bg_color="DkGray">
                 Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
-- 
cgit v1.2.3


From 85467c0ba654e2a787b216b89807e10fe1b078d8 Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Tue, 12 Jan 2010 17:27:36 +0200
Subject: Fixed major bug EXT-4121 ([BSI] Partner display is blank for
 residents on your friends list, on the first lookup after login)

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_my_profile.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_my_profile.xml')

diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml
index 5a023dab97..b8b9384462 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -261,14 +261,13 @@
              name="partner_data_panel"
              top_pad="0"
              width="300">
-              <text
+              <name_box
                follows="left|top"
                height="10"
                layout="topleft"
                left="0"
                name="partner_text"
                top="0"
-               value="[FIRST] [LAST]"
            width="300"
                word_wrap="true" />
             </panel>
-- 
cgit v1.2.3


From f0bbe788370bdc4a4479899be620e2d298d0be70 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Tue, 12 Jan 2010 18:33:43 +0200
Subject: added missing no_group_text string constant to panel_my_profile.xml

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_my_profile.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/panel_my_profile.xml')

diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml
index b8b9384462..038d48cdd6 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -27,6 +27,9 @@
     <string
      name="no_partner_text"
      value="None" />
+    <string
+     name="no_group_text"
+     value="None" />
     <string
 	 name="RegisterDateFormat">
 	 [REG_DATE] ([AGE])
-- 
cgit v1.2.3


From 6ad8674a8c5a87f438aa5ad6230396a859ba268e Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Wed, 13 Jan 2010 19:49:51 +0200
Subject: Fixed bug EXT-4210 (Partner in Profile not a Link). Added an optional
 "link" parameter to LLNameBox to display the name as a link.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_my_profile.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui/en/panel_my_profile.xml')

diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml
index 038d48cdd6..a9ff9362a0 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -269,6 +269,7 @@
                height="10"
                layout="topleft"
                left="0"
+               link="true"
                name="partner_text"
                top="0"
            width="300"
-- 
cgit v1.2.3


From 92653ac61cdd6838cf80c1f941bbfa6c8c6be2e2 Mon Sep 17 00:00:00 2001
From: Ramzi Linden <ramzi@lindenlab.com>
Date: Wed, 13 Jan 2010 13:01:01 -0800
Subject: EXT-3383 adhere to style guide for capitalization of 'Resident'

---
 indra/newview/skins/default/xui/en/panel_my_profile.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/panel_my_profile.xml')

diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml
index 8327edfdd0..4a1a468186 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -312,7 +312,7 @@
          left="0"
          mouse_opaque="false"
          name="add_friend"
-         tool_tip="Offer friendship to the resident"
+         tool_tip="Offer friendship to the Resident"
          top="5"
          width="80" />
         <button
-- 
cgit v1.2.3