livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-2266, Add web profile link to profile floaters, by Selo Jacobus

meow-7.2.2
Arrehn 2011-08-18 21:01:44 -04:00
parent 0cd25c177d
commit aa321ede58
4 changed files with 127 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llpanelprofileview.cpp
View File

@ -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 );

44
indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
View File

@ -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"

43
indra/newview/skins/metaharper/xui/en/panel_profile_secondlife.xml
View File

@ -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"

43
indra/newview/skins/metaharpersidetabs/xui/en/panel_profile_secondlife.xml
View File

@ -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"