From 2c722547ea57c1510a82200242a3ccff2e505d17 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Thu, 15 Jul 2010 10:20:06 -0700 Subject: changed allow_html to parse_urls to be clearer about its meaning allow_html still supported as alternate --- indra/llui/lldraghandle.cpp | 2 +- indra/llui/lltextbase.cpp | 5 +++-- indra/llui/lltextbase.h | 2 +- indra/llui/lltooltip.cpp | 2 +- indra/newview/llfolderview.cpp | 2 +- indra/newview/skins/default/xui/en/floater_aaa.xml | 2 +- indra/newview/skins/default/xui/en/floater_about.xml | 2 +- indra/newview/skins/default/xui/en/floater_im_session.xml | 2 +- indra/newview/skins/default/xui/en/floater_nearby_chat.xml | 2 +- indra/newview/skins/default/xui/en/floater_preview_notecard.xml | 2 +- indra/newview/skins/default/xui/en/inspect_object.xml | 2 +- indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml | 2 +- indra/newview/skins/default/xui/en/panel_chat_header.xml | 2 +- indra/newview/skins/default/xui/en/panel_classified_info.xml | 4 ++-- indra/newview/skins/default/xui/en/panel_clothing_list_item.xml | 2 +- .../skins/default/xui/en/panel_deletable_wearable_list_item.xml | 2 +- .../newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml | 2 +- indra/newview/skins/default/xui/en/panel_group_list_item.xml | 2 +- indra/newview/skins/default/xui/en/panel_group_notify.xml | 2 +- indra/newview/skins/default/xui/en/panel_inventory_item.xml | 2 +- indra/newview/skins/default/xui/en/panel_landmark_info.xml | 2 +- indra/newview/skins/default/xui/en/panel_notification.xml | 2 +- indra/newview/skins/default/xui/en/panel_pick_info.xml | 2 +- indra/newview/skins/default/xui/en/panel_place_profile.xml | 4 ++-- indra/newview/skins/default/xui/en/panel_teleport_history_item.xml | 2 +- indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml | 2 +- indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml | 2 +- .../skins/default/xui/en/widgets/deletable_wearable_list_item.xml | 2 +- .../skins/default/xui/en/widgets/dummy_clothing_list_item.xml | 2 +- indra/newview/skins/default/xui/en/widgets/expandable_text.xml | 2 +- indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml | 2 +- indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml | 2 +- indra/newview/skins/default/xui/en/widgets/text.xml | 2 +- indra/newview/skins/default/xui/en/widgets/text_editor.xml | 2 +- 34 files changed, 38 insertions(+), 37 deletions(-) (limited to 'indra') diff --git a/indra/llui/lldraghandle.cpp b/indra/llui/lldraghandle.cpp index 9f83fcca35..b52cb2b751 100644 --- a/indra/llui/lldraghandle.cpp +++ b/indra/llui/lldraghandle.cpp @@ -113,7 +113,7 @@ void LLDragHandleTop::setTitle(const std::string& title) params.follows.flags(FOLLOWS_TOP | FOLLOWS_LEFT | FOLLOWS_RIGHT); params.font_shadow(LLFontGL::DROP_SHADOW_SOFT); params.use_ellipses = true; - params.allow_html = false; //cancel URL replacement in floater title + params.parse_urls = false; //cancel URL replacement in floater title mTitleBox = LLUICtrlFactory::create (params); addChild( mTitleBox ); } diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index ed03645944..dd0b7ebad1 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -167,11 +167,12 @@ LLTextBase::Params::Params() font_shadow("font_shadow"), wrap("wrap"), use_ellipses("use_ellipses", false), - allow_html("allow_html", false), + parse_urls("parse_urls", false), parse_highlights("parse_highlights", false) { addSynonym(track_end, "track_bottom"); addSynonym(wrap, "word_wrap"); + addSynonym(parse_urls, "allow_html"); } @@ -209,7 +210,7 @@ LLTextBase::LLTextBase(const LLTextBase::Params &p) mPlainText ( p.plain_text ), mWordWrap(p.wrap), mUseEllipses( p.use_ellipses ), - mParseHTML(p.allow_html), + mParseHTML(p.parse_urls), mParseHighlights(p.parse_highlights), mBGVisible(p.bg_visible), mScroller(NULL), diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h index 4b0eeeb7d6..bd41272f11 100644 --- a/indra/llui/lltextbase.h +++ b/indra/llui/lltextbase.h @@ -251,7 +251,7 @@ public: plain_text, wrap, use_ellipses, - allow_html, + parse_urls, parse_highlights, clip_partial; diff --git a/indra/llui/lltooltip.cpp b/indra/llui/lltooltip.cpp index ed7fd02e14..025725476e 100644 --- a/indra/llui/lltooltip.cpp +++ b/indra/llui/lltooltip.cpp @@ -186,7 +186,7 @@ LLToolTip::LLToolTip(const LLToolTip::Params& p) params.font = p.font; params.use_ellipses = true; params.wrap = p.wrap; - params.allow_html = false; // disallow hyperlinks in tooltips, as they want to spawn their own explanatory tooltips + params.parse_urls = false; // disallow hyperlinks in tooltips, as they want to spawn their own explanatory tooltips mTextBox = LLUICtrlFactory::create (params); addChild(mTextBox); diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 87c5a830e9..8708ebebb0 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -250,7 +250,7 @@ LLFolderView::LLFolderView(const Params& p) text_p.name(std::string(p.name)); text_p.font(font); text_p.visible(false); - text_p.allow_html(true); + text_p.parse_urls(true); text_p.wrap(true); // allow multiline text. See EXT-7564, EXT-7047 // set text padding the same as in People panel. EXT-7047, EXT-4837 text_p.h_pad(STATUS_TEXT_HPAD); diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml index b9bc45a10b..cae6146880 100644 --- a/indra/newview/skins/default/xui/en/floater_aaa.xml +++ b/indra/newview/skins/default/xui/en/floater_aaa.xml @@ -21,7 +21,7 @@ This string CHANGE2 is extracted. Just a test. changes. diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml index ec097a8e87..3b26c2ab59 100644 --- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml @@ -25,7 +25,7 @@ single_instance="true" width="320"> Touch Sit + parse_urls="true"/> - -- cgit v1.2.3