From f291995dac53c2aba9d79aef8b6cd91a5c836e9f Mon Sep 17 00:00:00 2001
From: simon <none@none>
Date: Tue, 7 Jan 2014 15:18:29 -0800
Subject: [PATCH] Revert changes made for MAINT-535 to test in a release
cohort.
---
indra/llui/llscrolllistctrl.cpp | 4 +++-
indra/llui/lltextbase.cpp | 10 +++++++---
indra/llui/lltextbase.h | 14 +++++++++-----
indra/llui/llurlaction.cpp | 12 +++++++++---
indra/llui/llurlaction.h | 8 ++++++--
indra/llui/llurlentry.cpp | 6 ++++--
indra/newview/llchathistory.cpp | 3 ++-
indra/newview/llurldispatcher.cpp | 10 ++++++++--
indra/newview/llurldispatcher.h | 4 +++-
indra/newview/llurldispatcherlistener.cpp | 4 +++-
10 files changed, 54 insertions(+), 21 deletions(-)
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 594e1e150b1..d290413f7a9 100755
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -1855,7 +1855,9 @@ void LLScrollListCtrl::showNameDetails(std::string id, bool is_group)
// open the resident's details or the group details
std::string sltype = is_group ? "group" : "agent";
std::string slurl = "secondlife:///app/" + sltype + "/" + id + "/about";
- LLUrlAction::clickAction(slurl, true);
+ LLUrlAction::clickAction(slurl);
+ // MAINT-535 reversion test
+ //LLUrlAction::clickAction(slurl, true);
}
void LLScrollListCtrl::copyNameToClipboard(std::string id, bool is_group)
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 4144a42fd65..b51053ca4ca 100755
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -167,7 +167,8 @@ LLTextBase::Params::Params()
max_text_length("max_length", 255),
font_shadow("font_shadow"),
wrap("wrap"),
- trusted_content("trusted_content", true),
+ // MAINT-535 reversion test
+ // trusted_content("trusted_content", true),
use_ellipses("use_ellipses", false),
parse_urls("parse_urls", false),
parse_highlights("parse_highlights", false)
@@ -212,7 +213,8 @@ LLTextBase::LLTextBase(const LLTextBase::Params &p)
mLineSpacingPixels(p.line_spacing.pixels),
mClip(p.clip),
mClipPartial(p.clip_partial && !p.allow_scroll),
- mTrustedContent(p.trusted_content),
+ // MAINT-535 reversion test
+ // mTrustedContent(p.trusted_content),
mTrackEnd( p.track_end ),
mScrollIndex(-1),
mSelectionStart( 0 ),
@@ -3166,7 +3168,9 @@ BOOL LLNormalTextSegment::handleMouseUp(S32 x, S32 y, MASK mask)
// Only process the click if it's actually in this segment, not to the right of the end-of-line.
if(mEditor.getSegmentAtLocalPos(x, y, false) == this)
{
- LLUrlAction::clickAction(getStyle()->getLinkHREF(), mEditor.isContentTrusted());
+ LLUrlAction::clickAction(getStyle()->getLinkHREF());
+ // MAINT-535 reversion test
+ // LLUrlAction::clickAction(getStyle()->getLinkHREF(), mEditor.isContentTrusted());
return TRUE;
}
}
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index 3603f55c3f4..515e4d42575 100755
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -291,9 +291,11 @@ class LLTextBase
parse_urls,
parse_highlights,
clip,
- clip_partial,
- trusted_content;
-
+ clip_partial;
+ // MAINT-535 reversion test
+ // clip_partial,
+ // trusted_content;
+
Optional<S32> v_pad,
h_pad;
@@ -362,7 +364,8 @@ class LLTextBase
bool getWordWrap() { return mWordWrap; }
bool getUseEllipses() { return mUseEllipses; }
bool truncate(); // returns true of truncation occurred
- bool isContentTrusted() {return mTrustedContent;}
+ // MAINT-535 reversion test
+ //bool isContentTrusted() {return mTrustedContent;}
// TODO: move into LLTextSegment?
void createUrlContextMenu(S32 x, S32 y, const std::string &url); // create a popup context menu for the given Url
@@ -636,7 +639,8 @@ class LLTextBase
bool mBGVisible; // render background?
bool mClip; // clip text to widget rect
bool mClipPartial; // false if we show lines that are partially inside bounding rect
- bool mTrustedContent; // if false, does not allow to execute SURL links from this editor
+ // MAINT-535 reversion test
+ //bool mTrustedContent; // if false, does not allow to execute SURL links from this editor
bool mPlainText; // didn't use Image or Icon segments
bool mAutoIndent;
S32 mMaxTextByteLength; // Maximum length mText is allowed to be in bytes
diff --git a/indra/llui/llurlaction.cpp b/indra/llui/llurlaction.cpp
index 12537d9dd18..e392a88b6ae 100755
--- a/indra/llui/llurlaction.cpp
+++ b/indra/llui/llurlaction.cpp
@@ -87,14 +87,20 @@ void LLUrlAction::executeSLURL(std::string url)
{
if (sExecuteSLURLCallback)
{
- sExecuteSLURLCallback(url ,true);
+ sExecuteSLURLCallback(url);
+ // MAINT-535 reversion test
+ //sExecuteSLURLCallback(url ,true);
}
}
-void LLUrlAction::clickAction(std::string url, bool trusted_content)
+// MAINT-535 reversion test
+//void LLUrlAction::clickAction(std::string url, bool trusted_content)
+void LLUrlAction::clickAction(std::string url)
{
// Try to handle as SLURL first, then http Url
- if ( (sExecuteSLURLCallback) && !sExecuteSLURLCallback(url, trusted_content) )
+ // MAINT-535 reversion test
+ // if ( (sExecuteSLURLCallback) && !sExecuteSLURLCallback(url, trusted_content) )
+ if ( (sExecuteSLURLCallback) && !sExecuteSLURLCallback(url) )
{
if (sOpenURLCallback)
{
diff --git a/indra/llui/llurlaction.h b/indra/llui/llurlaction.h
index 5f3626490ca..407be9a7565 100755
--- a/indra/llui/llurlaction.h
+++ b/indra/llui/llurlaction.h
@@ -66,7 +66,9 @@ class LLUrlAction
static void showLocationOnMap(std::string url);
/// perform the appropriate action for left-clicking on a Url
- static void clickAction(std::string url, bool trusted_content);
+ static void clickAction(std::string url);
+ // MAINT-535 reversion test
+ //static void clickAction(std::string url, bool trusted_content);
/// copy the label for a Url to the clipboard
static void copyLabelToClipboard(std::string url);
@@ -86,7 +88,9 @@ class LLUrlAction
/// specify the callbacks to enable this class's functionality
typedef boost::function<void (const std::string&)> url_callback_t;
- typedef boost::function<bool(const std::string& url, bool trusted_content)> execute_url_callback_t;
+ typedef boost::function<bool(const std::string& url)> execute_url_callback_t;
+ // MAINT-535 reversion test
+ //typedef boost::function<bool(const std::string& url, bool trusted_content)> execute_url_callback_t;
static void setOpenURLCallback(url_callback_t cb);
static void setOpenURLInternalCallback(url_callback_t cb);
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index 840f67968d2..2d28ac41b2f 100755
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -1067,8 +1067,10 @@ LLUrlEntrySLLabel::LLUrlEntrySLLabel()
std::string LLUrlEntrySLLabel::getLabel(const std::string &url, const LLUrlLabelCallback &cb)
{
- std::string label = getLabelFromWikiLink(url);
- return (!LLUrlRegistry::instance().hasUrl(label)) ? label : getUrl(url);
+ // MAINT-535 reversion test
+ // std::string label = getLabelFromWikiLink(url);
+ // return (!LLUrlRegistry::instance().hasUrl(label)) ? label : getUrl(url);
+ return getLabelFromWikiLink(url);
}
std::string LLUrlEntrySLLabel::getUrl(const std::string &string) const
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index abeaf958eba..1574c9f613d 100755
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -731,7 +731,8 @@ LLChatHistory::LLChatHistory(const LLChatHistory::Params& p)
editor_params.follows.flags = FOLLOWS_ALL;
editor_params.enabled = false; // read only
editor_params.show_context_menu = "true";
- editor_params.trusted_content = false;
+ // MAINT-535 reversion test
+ //editor_params.trusted_content = false;
mEditor = LLUICtrlFactory::create<LLTextEditor>(editor_params, this);
mEditor->setIsFriendCallback(LLAvatarActions::isFriend);
}
diff --git a/indra/newview/llurldispatcher.cpp b/indra/newview/llurldispatcher.cpp
index 0c34db39b58..6e8ee38a2fc 100755
--- a/indra/newview/llurldispatcher.cpp
+++ b/indra/newview/llurldispatcher.cpp
@@ -307,7 +307,9 @@ bool LLURLDispatcher::dispatchRightClick(const std::string& slurl)
}
// static
-bool LLURLDispatcher::dispatchFromTextEditor(const std::string& slurl, bool trusted_content)
+// MAINT-535 reversion test
+// bool LLURLDispatcher::dispatchFromTextEditor(const std::string& slurl, bool trusted_content)
+bool LLURLDispatcher::dispatchFromTextEditor(const std::string& slurl)
{
// *NOTE: Text editors are considered sources of trusted URLs
// in order to make avatar profile links in chat history work.
@@ -315,9 +317,13 @@ bool LLURLDispatcher::dispatchFromTextEditor(const std::string& slurl, bool trus
// receiving resident will see it and must affirmatively
// click on it.
// *TODO: Make this trust model more refined. JC
+ const bool trusted_browser = true;
LLMediaCtrl* web = NULL;
- return LLURLDispatcherImpl::dispatch(LLSLURL(slurl), "clicked", web, trusted_content);
+ return LLURLDispatcherImpl::dispatch(LLSLURL(slurl), "clicked", web, trusted_browser);
+
+ // MAINT-535 reversion test
+ //return LLURLDispatcherImpl::dispatch(LLSLURL(slurl), "clicked", web, trusted_content);
}
diff --git a/indra/newview/llurldispatcher.h b/indra/newview/llurldispatcher.h
index 9b05260af11..1e38fb2a73e 100755
--- a/indra/newview/llurldispatcher.h
+++ b/indra/newview/llurldispatcher.h
@@ -53,7 +53,9 @@ class LLURLDispatcher
static bool dispatchRightClick(const std::string& slurl);
- static bool dispatchFromTextEditor(const std::string& slurl, bool trusted_content);
+ static bool dispatchFromTextEditor(const std::string& slurl);
+ // MAINT-535 reversion test
+ //static bool dispatchFromTextEditor(const std::string& slurl, bool trusted_content);
};
#endif
diff --git a/indra/newview/llurldispatcherlistener.cpp b/indra/newview/llurldispatcherlistener.cpp
index 7545f3a9b3b..03a3eb26a0e 100755
--- a/indra/newview/llurldispatcherlistener.cpp
+++ b/indra/newview/llurldispatcherlistener.cpp
@@ -71,5 +71,7 @@ void LLURLDispatcherListener::dispatchRightClick(const LLSD& params) const
void LLURLDispatcherListener::dispatchFromTextEditor(const LLSD& params) const
{
- LLURLDispatcher::dispatchFromTextEditor(params["url"], false);
+ LLURLDispatcher::dispatchFromTextEditor(params["url"]);
+ // MAINT-535 reversion test
+ // LLURLDispatcher::dispatchFromTextEditor(params["url"], false);
}
--
GitLab