Merge remote-tracking branch 'mccabe/exp' into weekly

Conflicts:  (Keeping these around as a record, there was some strangeness.
	.gitignore
	linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
	linden/indra/newview/llfloaterregioninfo.cpp
	linden/indra/newview/llfloatertos.cpp
	linden/indra/newview/llpanellogin.cpp
	linden/indra/newview/skins/default/html/en-us/loading-error/index.html
	linden/indra/newview/skins/default/html/en-us/loading/loading.html
	linden/indra/newview/skins/default/xui/en-us/floater_about.xml
	linden/install.xml

1 files changed, 2 insertions, 11 deletions

diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 00d9332..d00ccd9 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -347,16 +347,6 @@ void LLPanelLogin::setSiteIsAlive( bool alive )
         else
         // the site is not available (missing page, server down, other badness)
         {
-#if !USE_VIEWER_AUTH
-                if ( web_browser )
-                {
-                        // hide browser control (revealing default one)
-                        web_browser->setVisible( FALSE );
-
-                        // mark as unavailable
-                        mHtmlAvailable = FALSE;
-                }
-#else
 
                 if ( web_browser )
                 {       
@@ -365,7 +355,7 @@ void LLPanelLogin::setSiteIsAlive( bool alive )
                         // mark as available
                         mHtmlAvailable = TRUE;
                 }
-#endif
+
         }
 }
 
@@ -1164,3 +1154,4 @@ void LLPanelLogin::onServerComboLostFocus(LLFocusableElement* fe, void*)
         }
 }
 */
+