diff options
| author | Cho <cho@lindenlab.com> | 2014-06-02 21:16:28 +0100 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2014-06-02 21:16:28 +0100 |
| commit | f10f3d2fdec90b0ca4d34e6b90642e7c45896d9e (patch) | |
| tree | d2d01400bf4f01de18f1776cf1506cbae9c3aed4 | |
| parent | 099ed7065591b4716c08ed9f6ffc8edfcaacfae0 (diff) | |
Added URL menu for experience profile links for ACME-1469
| -rwxr-xr-x | indra/llui/llurlentry.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llfloaterexperienceprofile.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_url_experience.xml | 12 |
3 files changed, 15 insertions, 1 deletions
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp index eba715f58d..67da98b95a 100755 --- a/indra/llui/llurlentry.cpp +++ b/indra/llui/llurlentry.cpp @@ -1208,6 +1208,7 @@ LLUrlEntryExperienceProfile::LLUrlEntryExperienceProfile() mPattern = boost::regex(APP_HEADER_REGEX "/experience/[\\da-f-]+/\\w+\\S*", boost::regex::perl|boost::regex::icase); mIcon = "Generic_Experience"; + mMenuName = "menu_url_experience.xml"; } std::string LLUrlEntryExperienceProfile::getLabel( const std::string &url, const LLUrlLabelCallback &cb ) diff --git a/indra/newview/llfloaterexperienceprofile.cpp b/indra/newview/llfloaterexperienceprofile.cpp index c14d77a944..f80fdd9cfe 100644 --- a/indra/newview/llfloaterexperienceprofile.cpp +++ b/indra/newview/llfloaterexperienceprofile.cpp @@ -463,7 +463,8 @@ void LLFloaterExperienceProfile::refreshExperience( const LLSD& experience ) LLTextBox* child = getChild<LLTextBox>(TF_NAME); - child->setText(experience[LLExperienceCache::NAME].asString()); + //child->setText(experience[LLExperienceCache::NAME].asString()); + child->setText(LLSLURL("experience", experience[LLExperienceCache::EXPERIENCE_ID], "profile").getSLURLString()); LLLineEditor* linechild = getChild<LLLineEditor>(EDIT TF_NAME); linechild->setText(experience[LLExperienceCache::NAME].asString()); diff --git a/indra/newview/skins/default/xui/en/menu_url_experience.xml b/indra/newview/skins/default/xui/en/menu_url_experience.xml new file mode 100644 index 0000000000..f4d50e1603 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_url_experience.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Url Popup"> + <menu_item_call + label="Copy SLurl to clipboard" + layout="topleft" + name="url_copy"> + <menu_item_call.on_click + function="Url.CopyUrl" /> + </menu_item_call> +</context_menu> |