diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2012-04-13 00:26:33 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2012-04-13 00:26:33 +0300 |
| commit | 1e74372f50a2cb2ed3364e79344b0408e7e8d89b (patch) | |
| tree | 30adf2b0fc70b8ffb9cf2c8a2361529647bbec15 /indra | |
| parent | bc4702a7c74977d4f685902b1d6f5d3cb07318d4 (diff) | |
CHUI-90 WIP Added "View full profile" link to avatar inspectors.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llinspectavatar.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/inspect_avatar.xml | 13 |
2 files changed, 16 insertions, 1 deletions
diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp index bf71a5c5c5..8a15cd279f 100644 --- a/indra/newview/llinspectavatar.cpp +++ b/indra/newview/llinspectavatar.cpp @@ -33,6 +33,7 @@ #include "llavatarpropertiesprocessor.h" #include "lldateutil.h" #include "llinspect.h" +#include "llslurl.h" #include "llstartup.h" #include "lltransientfloatermgr.h" @@ -181,6 +182,9 @@ void LLInspectAvatar::onOpen(const LLSD& data) LLUI::positionViewNearMouse(this); } + // Generate link to avatar profile. + getChild<LLUICtrl>("avatar_profile_link")->setTextArg("[LINK]", LLSLURL("agent", mAvatarID, "about").getSLURLString()); + // can't call from constructor as widgets are not built yet requestUpdate(); } diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml index 866d54e4f8..c3481e6d4c 100644 --- a/indra/newview/skins/default/xui/en/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml @@ -9,7 +9,7 @@ bg_opaque_image="Inspector_Background" can_close="false" can_minimize="false" - height="164" + height="130" layout="topleft" name="inspect_avatar" single_instance="true" @@ -94,6 +94,17 @@ use_ellipses="true" width="220">This is my second life description and I really think it is great. But for some reason my description is super extra long because I like to talk a whole lot </text> + <text + follows="top|left" + height="16" + left="8" + name="avatar_profile_link" + font="SansSerifSmall" + text_color="White" + top_pad="5" + translate="false" + value="[[LINK] View full profile]" + width="175" /> <avatar_icon follows="top|left" height="38" |