diff --git a/BuildParams b/BuildParams
index 9b5a9cfb3fd5a51c1b3370b4eef15e591286b788..6adae15d5f82ed90228292b66c5586c63ee1a6a3 100644
--- a/BuildParams
+++ b/BuildParams
@@ -28,25 +28,7 @@ viewer-development.show_changes_since = 2-1-release
 # Build Settings
 viewer-development_coverity.coverity_product = viewer
 
-viewer-development.build_Linux = true
-viewer-development_debug.build_Linux = false
-viewer-development_coverity.build_Linux = false
-
-viewer-development.build_Darwin = true
-viewer-development_debug.build_Darwin = false
-viewer-development_coverity.build_Darwin = false
-
-viewer-development.build_CYGWIN = true
-viewer-development.build_CYGWIN_Debug = false
-viewer-development.build_CYGWIN_RelWithDebInfo = false
-viewer-development.build_CYGWIN_Release = true
-viewer-development_debug.build_CYGWIN_Debug = true
-viewer-development_debug.build_CYGWIN_RelWithDebInfo = true
-viewer-development_debug.build_CYGWIN_Release = false
-viewer-development_coverity.build_coverity = true
-viewer-development_coverity.build_CYGWIN_Debug = false
-viewer-development_coverity.build_CYGWIN_RelWithDebInfo = false
-viewer-development_coverity.build_CYGWIN_Release = true
+viewer-development.build_debug_release_separately = true
 
 # Notifications - to configure email notices, add a setting like this:
 # <username>_<reponame>.email = <email-address>
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 60c313b6ce3a8c5153c083da191ab7074a9e2489..b95596fa70a6f4efeffb6dcde7fefd7befef4d92 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1611,9 +1611,6 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para
 		while ( LLUrlRegistry::instance().findUrl(text, match,
 		        boost::bind(&LLTextBase::replaceUrlLabel, this, _1, _2)) )
 		{
-			
-			LLTextUtil::processUrlMatch(&match,this);
-
 			start = match.getStart();
 			end = match.getEnd()+1;
 
@@ -1638,6 +1635,10 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para
 				std::string subtext=text.substr(0,start);
 				appendAndHighlightText(subtext, part, style_params); 
 			}
+
+			// inserts an avatar icon preceding the Url if appropriate
+			LLTextUtil::processUrlMatch(&match,this);
+
 			// output the styled Url (unless we've been asked to suppress hyperlinking)
 			if (match.isLinkDisabled())
 			{