From aa321ede58b82fb4ca8aa6dbde25dfd5df8d6a5f Mon Sep 17 00:00:00 2001
From: Arrehn <none@none>
Date: Thu, 18 Aug 2011 21:01:44 -0400
Subject: [PATCH] FIRE-2266, Add web profile link to profile floaters, by Selo
 Jacobus

---
 indra/newview/llpanelprofileview.cpp          |  4 ++
 .../xui/en/panel_profile_secondlife.xml       | 44 +++++++++++++++++--
 .../xui/en/panel_profile_secondlife.xml       | 43 +++++++++++++++++-
 .../xui/en/panel_profile_secondlife.xml       | 43 +++++++++++++++++-
 4 files changed, 127 insertions(+), 7 deletions(-)

diff --git a/indra/newview/llpanelprofileview.cpp b/indra/newview/llpanelprofileview.cpp
index bee6ad4e93..c4666f1712 100644
--- a/indra/newview/llpanelprofileview.cpp
+++ b/indra/newview/llpanelprofileview.cpp
@@ -136,6 +136,8 @@ void LLPanelProfileView::onOpen(const LLSD& key)
 		getChild<LLUICtrl>("display_name")->setValue( LLSD() );
 		getChild<LLUICtrl>("user_name")->setValue( LLSD() );
 		getChild<LLUICtrl>("user_key")->setValue( LLSD() );
+		//[ADD: FIRE-2266: SJ] Adding link to webprofiles on profile which opens Web Profiles in browser
+		getChild<LLUICtrl>("web_profile_text")->setValue( LLSD() );
 	}
 
 	// Update the avatar name.
@@ -281,6 +283,8 @@ void LLPanelProfileView::onAvatarNameCache(const LLUUID& agent_id,
 	getChild<LLUICtrl>("user_name")->setValue( av_name.mUsername );
 	getChild<LLUICtrl>("user_key")->setValue( agent_id.asString() );
 	getChild<LLUICtrl>("copy_uri")->setEnabled( true );
+	//[ADD: FIRE-2266: SJ] Adding link to webprofiles on profile which opens Web Profiles in browser
+	getChild<LLUICtrl>("web_profile_text")->setValue( "https://my.secondlife.com/" + av_name.mUsername );
 
 #if 0
 	getChild<LLUICtrl>("user_name")->setValue( av_name.mDisplayName );
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 40821d8715..32abfe8e0e 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -116,7 +116,7 @@ KC: I used view_border's around text_editor's due to text render issues with bor
              name="status"
              text_color="LtGray_50"
              value="" />
-
+            
             <text
              top_pad="2"
              follows="left|top"
@@ -158,7 +158,45 @@ KC: I used view_border's around text_editor's due to text render issues with bor
              label="Copy URI"
              enabled="false"
              follows="top|right" />
+            
+<!--
+FIRE-2266: SJ: Link to webprofiles on main panel
+-->
+            <text
+             top_pad="2"
+             follows="left|top"
+             halign="right"
+             height="16"
+             left="6"
+             name="Web:"
+             width="40"
+             value="Web:" />
 
+
+            <view_border
+             left_pad="4"
+             height="16"
+             right="-6"
+             bevel_style="in"
+             follows="left|top|right"
+             name="web_border" />
+            
+            <text
+             left_delta="3"
+             bottom_delta="2"
+             height="16"
+             right="-6"
+             h_pad="0"
+             v_pad="0"
+             allow_scroll="false"
+             bg_visible="false"
+             enabled="true"
+             follows="left|top|right"
+             name="web_profile_text"
+             value="" />
+<!--
+FIRE-2266: SJ: End change
+-->            
             <texture_picker
              left="6"
              top_pad="3"
@@ -301,7 +339,7 @@ KC: I used view_border's around text_editor's due to text render issues with bor
             <view_border
              left_pad="6"
              top_delta="0"
-             height="90"
+             height="74"
              right="-6"
              bevel_style="in"
              follows="all"
@@ -309,7 +347,7 @@ KC: I used view_border's around text_editor's due to text render issues with bor
             <text_editor
              left_delta="1"
              top_delta="1"
-             height="88"
+             height="72"
              right="-7"
              read_only="true"
              enabled="false"
diff --git a/indra/newview/skins/metaharper/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/metaharper/xui/en/panel_profile_secondlife.xml
index 438e6bdb50..0140a373ac 100644
--- a/indra/newview/skins/metaharper/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/metaharper/xui/en/panel_profile_secondlife.xml
@@ -159,6 +159,45 @@ KC: I used view_border's around text_editor's due to text render issues with bor
              enabled="false"
              follows="top|right" />
 
+<!--
+FIRE-2266: SJ: Link to webprofiles on main panel
+-->
+            <text
+             top_pad="2"
+             follows="left|top"
+             halign="right"
+             height="16"
+             left="6"
+             name="Web:"
+             width="40"
+             value="Web:" />
+
+
+            <view_border
+             left_pad="4"
+             height="16"
+             right="-6"
+             bevel_style="in"
+             follows="left|top|right"
+             name="web_border" />
+
+            <text
+             left_delta="3"
+             bottom_delta="2"
+             height="16"
+             right="-6"
+             h_pad="0"
+             v_pad="0"
+             allow_scroll="false"
+             bg_visible="false"
+             enabled="true"
+             follows="left|top|right"
+             name="web_profile_text"
+             value="" />
+<!--
+FIRE-2266: SJ: End change
+-->
+
             <texture_picker
              left="6"
              top_pad="3"
@@ -278,7 +317,7 @@ KC: I used view_border's around text_editor's due to text render issues with bor
             <view_border
              left_pad="6"
              top_delta="0"
-             height="90"
+             height="74"
              right="-6"
              bevel_style="in"
              follows="all"
@@ -286,7 +325,7 @@ KC: I used view_border's around text_editor's due to text render issues with bor
             <text_editor
              left_delta="1"
              top_delta="1"
-             height="88"
+             height="72"
              right="-7"
              read_only="true"
              enabled="false"
diff --git a/indra/newview/skins/metaharpersidetabs/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/metaharpersidetabs/xui/en/panel_profile_secondlife.xml
index 438e6bdb50..29d55aeb8a 100644
--- a/indra/newview/skins/metaharpersidetabs/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/metaharpersidetabs/xui/en/panel_profile_secondlife.xml
@@ -159,6 +159,45 @@ KC: I used view_border's around text_editor's due to text render issues with bor
              enabled="false"
              follows="top|right" />
 
+<!--
+FIRE-2266: SJ: Link to webprofiles on main panel
+-->
+            <text
+             top_pad="2"
+             follows="left|top"
+             halign="right"
+             height="16"
+             left="6"
+             name="Web:"
+             width="40"
+             value="Web:" />
+
+
+            <view_border
+             left_pad="4"
+             height="16"
+             right="-6"
+             bevel_style="in"
+             follows="left|top|right"
+             name="web_border" />
+
+            <text
+             left_delta="3"
+             bottom_delta="2"
+             height="16"
+             right="-6"
+             h_pad="0"
+             v_pad="0"
+             allow_scroll="false"
+             bg_visible="false"
+             enabled="true"
+             follows="left|top|right"
+             name="web_profile_text"
+             value="" />
+
+<!--
+FIRE-2266: SJ: End change
+-->
             <texture_picker
              left="6"
              top_pad="3"
@@ -278,7 +317,7 @@ KC: I used view_border's around text_editor's due to text render issues with bor
             <view_border
              left_pad="6"
              top_delta="0"
-             height="90"
+             height="74"
              right="-6"
              bevel_style="in"
              follows="all"
@@ -286,7 +325,7 @@ KC: I used view_border's around text_editor's due to text render issues with bor
             <text_editor
              left_delta="1"
              top_delta="1"
-             height="88"
+             height="72"
              right="-7"
              read_only="true"
              enabled="false"