diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index d290413f7a9223a74363ed9795ecdddfaf36e748..594e1e150b1748640b583fbf52d7ff5e65404d98 100755
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -1855,9 +1855,7 @@ 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);
- // MAINT-535 reversion test
- //LLUrlAction::clickAction(slurl, true);
+ 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 b51053ca4ca0b92d711dc0a009fcd15fc45607a0..4144a42fd6559e98414843ac6b3c08590d776af7 100755
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -167,8 +167,7 @@ LLTextBase::Params::Params()
max_text_length("max_length", 255),
font_shadow("font_shadow"),
wrap("wrap"),
- // MAINT-535 reversion test
- // trusted_content("trusted_content", true),
+ trusted_content("trusted_content", true),
use_ellipses("use_ellipses", false),
parse_urls("parse_urls", false),
parse_highlights("parse_highlights", false)
@@ -213,8 +212,7 @@ LLTextBase::LLTextBase(const LLTextBase::Params &p)
mLineSpacingPixels(p.line_spacing.pixels),
mClip(p.clip),
mClipPartial(p.clip_partial && !p.allow_scroll),
- // MAINT-535 reversion test
- // mTrustedContent(p.trusted_content),
+ mTrustedContent(p.trusted_content),
mTrackEnd( p.track_end ),
mScrollIndex(-1),
mSelectionStart( 0 ),
@@ -3168,9 +3166,7 @@ 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());
- // MAINT-535 reversion test
- // LLUrlAction::clickAction(getStyle()->getLinkHREF(), mEditor.isContentTrusted());
+ LLUrlAction::clickAction(getStyle()->getLinkHREF(), mEditor.isContentTrusted());
return TRUE;
}
}
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index 515e4d42575f738edc0344838de1639e5b927b2c..3603f55c3f42b50e730eff57ba8f7a0c3c66673e 100755
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -291,11 +291,9 @@ class LLTextBase
parse_urls,
parse_highlights,
clip,
- clip_partial;
- // MAINT-535 reversion test
- // clip_partial,
- // trusted_content;
-
+ clip_partial,
+ trusted_content;
+
Optional<S32> v_pad,
h_pad;
@@ -364,8 +362,7 @@ class LLTextBase
bool getWordWrap() { return mWordWrap; }
bool getUseEllipses() { return mUseEllipses; }
bool truncate(); // returns true of truncation occurred
- // MAINT-535 reversion test
- //bool isContentTrusted() {return mTrustedContent;}
+ 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
@@ -639,8 +636,7 @@ 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
- // MAINT-535 reversion test
- //bool mTrustedContent; // if false, does not allow to execute SURL links from this editor
+ 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 e392a88b6aeb0577539eed8004a9c4c4ff1983c8..12537d9dd18a7ce67685bdd388b2c67f1acec374 100755
--- a/indra/llui/llurlaction.cpp
+++ b/indra/llui/llurlaction.cpp
@@ -87,20 +87,14 @@ void LLUrlAction::executeSLURL(std::string url)
{
if (sExecuteSLURLCallback)
{
- sExecuteSLURLCallback(url);
- // MAINT-535 reversion test
- //sExecuteSLURLCallback(url ,true);
+ sExecuteSLURLCallback(url ,true);
}
}
-// MAINT-535 reversion test
-//void LLUrlAction::clickAction(std::string url, bool trusted_content)
-void LLUrlAction::clickAction(std::string url)
+void LLUrlAction::clickAction(std::string url, bool trusted_content)
{
// Try to handle as SLURL first, then http Url
- // MAINT-535 reversion test
- // if ( (sExecuteSLURLCallback) && !sExecuteSLURLCallback(url, trusted_content) )
- if ( (sExecuteSLURLCallback) && !sExecuteSLURLCallback(url) )
+ if ( (sExecuteSLURLCallback) && !sExecuteSLURLCallback(url, trusted_content) )
{
if (sOpenURLCallback)
{
diff --git a/indra/llui/llurlaction.h b/indra/llui/llurlaction.h
index 407be9a75659fe35c3ec1cf2a9c6633c89ac45c5..5f3626490cabfe6d58e586752ac2c9493f832c69 100755
--- a/indra/llui/llurlaction.h
+++ b/indra/llui/llurlaction.h
@@ -66,9 +66,7 @@ class LLUrlAction
static void showLocationOnMap(std::string url);
/// perform the appropriate action for left-clicking on a Url
- static void clickAction(std::string url);
- // MAINT-535 reversion test
- //static void clickAction(std::string url, bool trusted_content);
+ static void clickAction(std::string url, bool trusted_content);
/// copy the label for a Url to the clipboard
static void copyLabelToClipboard(std::string url);
@@ -88,9 +86,7 @@ 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)> execute_url_callback_t;
- // MAINT-535 reversion test
- //typedef boost::function<bool(const std::string& url, bool trusted_content)> execute_url_callback_t;
+ 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 2d28ac41b2f0a7fe456827862391204c4a61af2b..840f67968d2a68178dd71bfd93b5eaf08a30ff31 100755
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -1067,10 +1067,8 @@ LLUrlEntrySLLabel::LLUrlEntrySLLabel()
std::string LLUrlEntrySLLabel::getLabel(const std::string &url, const LLUrlLabelCallback &cb)
{
- // MAINT-535 reversion test
- // std::string label = getLabelFromWikiLink(url);
- // return (!LLUrlRegistry::instance().hasUrl(label)) ? label : getUrl(url);
- return getLabelFromWikiLink(url);
+ std::string label = getLabelFromWikiLink(url);
+ return (!LLUrlRegistry::instance().hasUrl(label)) ? label : getUrl(url);
}
std::string LLUrlEntrySLLabel::getUrl(const std::string &string) const
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index 1574c9f613d4b491deef7e577f7d342e2721ee00..abeaf958ebab2c29b61b6d9556cbdf68cc5e97e3 100755
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -731,8 +731,7 @@ LLChatHistory::LLChatHistory(const LLChatHistory::Params& p)
editor_params.follows.flags = FOLLOWS_ALL;
editor_params.enabled = false; // read only
editor_params.show_context_menu = "true";
- // MAINT-535 reversion test
- //editor_params.trusted_content = false;
+ 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 6e8ee38a2fcfc4fbd7bb4e1e586fc5f30451b8f1..0c34db39b58e22107b76e6c2e78b322c26ed30e9 100755
--- a/indra/newview/llurldispatcher.cpp
+++ b/indra/newview/llurldispatcher.cpp
@@ -307,9 +307,7 @@ bool LLURLDispatcher::dispatchRightClick(const std::string& slurl)
}
// static
-// MAINT-535 reversion test
-// bool LLURLDispatcher::dispatchFromTextEditor(const std::string& slurl, bool trusted_content)
-bool LLURLDispatcher::dispatchFromTextEditor(const std::string& slurl)
+bool LLURLDispatcher::dispatchFromTextEditor(const std::string& slurl, bool trusted_content)
{
// *NOTE: Text editors are considered sources of trusted URLs
// in order to make avatar profile links in chat history work.
@@ -317,13 +315,9 @@ bool LLURLDispatcher::dispatchFromTextEditor(const std::string& slurl)
// 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_browser);
-
- // MAINT-535 reversion test
- //return LLURLDispatcherImpl::dispatch(LLSLURL(slurl), "clicked", web, trusted_content);
+ return LLURLDispatcherImpl::dispatch(LLSLURL(slurl), "clicked", web, trusted_content);
}
diff --git a/indra/newview/llurldispatcher.h b/indra/newview/llurldispatcher.h
index 1e38fb2a73eb5ca15e1b00b91ac2b5b219e1aaa8..9b05260af11e5d9a9676937fe6111b965078cb1b 100755
--- a/indra/newview/llurldispatcher.h
+++ b/indra/newview/llurldispatcher.h
@@ -53,9 +53,7 @@ class LLURLDispatcher
static bool dispatchRightClick(const std::string& slurl);
- static bool dispatchFromTextEditor(const std::string& slurl);
- // MAINT-535 reversion test
- //static bool dispatchFromTextEditor(const std::string& slurl, bool trusted_content);
+ static bool dispatchFromTextEditor(const std::string& slurl, bool trusted_content);
};
#endif
diff --git a/indra/newview/llurldispatcherlistener.cpp b/indra/newview/llurldispatcherlistener.cpp
index 03a3eb26a0e6ee670398363521405cf77f0ce448..7545f3a9b3bd72b4e1a3a1affba6b3241496c894 100755
--- a/indra/newview/llurldispatcherlistener.cpp
+++ b/indra/newview/llurldispatcherlistener.cpp
@@ -71,7 +71,5 @@ void LLURLDispatcherListener::dispatchRightClick(const LLSD& params) const
void LLURLDispatcherListener::dispatchFromTextEditor(const LLSD& params) const
{
- LLURLDispatcher::dispatchFromTextEditor(params["url"]);
- // MAINT-535 reversion test
- // LLURLDispatcher::dispatchFromTextEditor(params["url"], false);
+ LLURLDispatcher::dispatchFromTextEditor(params["url"], false);
}