From cfadbe631fbf845db8e26793613dea37ef08d11c Mon Sep 17 00:00:00 2001
From: simon <none@none>
Date: Fri, 10 Jan 2014 13:15:19 -0800
Subject: Revert earlier back-out for MAINT-535 ... it's back in

---
 indra/llui/lltextbase.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'indra/llui/lltextbase.cpp')

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index b51053ca4c..4144a42fd6 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;
 		}
 	}
-- 
cgit v1.2.3