From 4b414302cf97922b5200814b0ea1d3ddcd0b3b58 Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Thu, 30 Sep 2010 22:11:01 +0300 Subject: STORM-214 FIXED Disabled URL highlighting in pick names. --- indra/newview/skins/default/xui/en/panel_pick_list_item.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml index de147908d8..43d580844f 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml @@ -52,6 +52,7 @@ layout="topleft" left="110" name="picture_name" + parse_urls="false" text_color="white" top="9" use_ellipses="true" -- cgit v1.2.3 From 9862c58e1b3eec24e412ee7c2980d2945c38360e Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Thu, 30 Sep 2010 23:35:48 +0300 Subject: STORM-215 FIXED Disabled URL highlighting in name_box'es. By the way, fixed invalid SLURLs that LLNameBox generated for groups. --- indra/newview/llnamebox.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/newview/llnamebox.cpp b/indra/newview/llnamebox.cpp index 74d4217899..c31da84f78 100644 --- a/indra/newview/llnamebox.cpp +++ b/indra/newview/llnamebox.cpp @@ -47,6 +47,7 @@ LLNameBox::LLNameBox(const Params& p) { mNameID = LLUUID::null; mLink = p.link; + mParseHTML = mLink; // STORM-215 mInitialValue = p.initial_value().asString(); LLNameBox::sInstances.insert(this); setText(LLStringUtil::null); @@ -119,7 +120,7 @@ void LLNameBox::setName(const std::string& name, BOOL is_group) std::string url; if (is_group) - url = "[secondlife:///app/group/" + LLURI::escape(name) + "/about " + name + "]"; + url = "[secondlife:///app/group/" + mNameID.asString() + "/about " + name + "]"; else url = "[secondlife:///app/agent/" + mNameID.asString() + "/about " + name + "]"; -- cgit v1.2.3 From f92ad98d62f298c0005f7bc8cac503ada8dc88d0 Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Fri, 1 Oct 2010 18:27:12 +0300 Subject: STORM-213 FIXED Disabled highlighting URLs in object names in group notification toasts. --- indra/newview/skins/default/xui/en/panel_group_notify.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml index 6f271a757c..cded4cf31a 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml @@ -85,6 +85,7 @@ layout="topleft" left="45" name="attachment" + parse_urls="false" text_color="GroupNotifyTextColor" value="Attachment" use_ellipses="true" -- cgit v1.2.3 From 7af6d1c7319bc0f339e9159161c05ed6eb45fb5b Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Fri, 1 Oct 2010 18:58:20 +0300 Subject: STORM-307 FIXED Disabled highlighting of URLs in outfit names. Affected: My Outfits and Edit Outfit panels. --- indra/llui/llaccordionctrltab.cpp | 1 + indra/newview/skins/default/xui/en/panel_outfit_edit.xml | 1 + indra/newview/skins/default/xui/en/sidepanel_appearance.xml | 1 + 3 files changed, 3 insertions(+) diff --git a/indra/llui/llaccordionctrltab.cpp b/indra/llui/llaccordionctrltab.cpp index b7da5f4a1b..e28ef1f25d 100644 --- a/indra/llui/llaccordionctrltab.cpp +++ b/indra/llui/llaccordionctrltab.cpp @@ -141,6 +141,7 @@ LLAccordionCtrlTab::LLAccordionCtrlTabHeader::LLAccordionCtrlTabHeader( textboxParams.use_ellipses = true; textboxParams.bg_visible = false; textboxParams.mouse_opaque = false; + textboxParams.parse_urls = false; mHeaderTextbox = LLUICtrlFactory::create(textboxParams); addChild(mHeaderTextbox); } diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml index e0426c75b4..a48a9ce626 100644 --- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml @@ -132,6 +132,7 @@ height="18" layout="topleft" name="curr_outfit_name" + parse_urls="false" text_color="LtGray" top_pad="2" value="[Current Outfit]" diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml index c1c0f07304..b5839878d5 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml @@ -77,6 +77,7 @@ width="333"> font="SansSerifLargeBold" height="20" left="35" + parse_urls="false" text_color="White" top="15" use_ellipses="true" -- cgit v1.2.3