Second Life viewer sources 1.19.1.0

1 files changed, 19 insertions, 37 deletions

diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 24d235e..26075a1 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -71,7 +71,8 @@
 #include "llwebbrowserctrl.h"
 
 #include "llfloaterhtml.h"
-//#include "llfloaterhtmlhelp.h"
+
+#include "llfloaterhtmlhelp.h"
 #include "llfloatertos.h"
 
 #include "llglheaders.h"
@@ -95,12 +96,10 @@ public:
         LLLoginRefreshHandler() : LLCommandHandler("login_refresh", false) { }
         bool handle(const LLSD& tokens, const LLSD& queryMap)
         {       
-#if LL_LIBXUL_ENABLED
                 if (LLStartUp::getStartupState() < STATE_LOGIN_CLEANUP)
                 {
                         LLPanelLogin::loadLoginPage();
                 }       
-#endif
                 return true;
         }
 };
@@ -329,7 +328,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
         mCallbackData(cb_data),
         mHtmlAvailable( TRUE )
 {
-        mIsFocusRoot = TRUE;
+        setFocusRoot(TRUE);
 
         setBackgroundVisible(FALSE);
         setBackgroundOpaque(TRUE);
@@ -443,8 +442,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
 #endif    
         
         // get the web browser control
-        #if LL_LIBXUL_ENABLED
-        LLWebBrowserCtrl* web_browser = LLUICtrlFactory::getWebBrowserCtrlByName(this, "login_html");
+        LLWebBrowserCtrl* web_browser = getChild<LLWebBrowserCtrl>("login_html");
         if ( web_browser )
         {
                 // Need to handle login secondlife:///app/ URLs
@@ -461,28 +459,25 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
                 web_browser->setOpenInExternalBrowser( true );
 
                 // force the size to be correct (XML doesn't seem to be sufficient to do this) (with some padding so the other login screen doesn't show through)
-                LLRect htmlRect = mRect;
+                LLRect htmlRect = getRect();
 #if USE_VIEWER_AUTH
-                htmlRect.setCenterAndSize( mRect.getCenterX() - 2, mRect.getCenterY(), mRect.getWidth() + 6, mRect.getHeight());
+                htmlRect.setCenterAndSize( getRect().getCenterX() - 2, getRect().getCenterY(), getRect().getWidth() + 6, getRect().getHeight());
 #else
-                htmlRect.setCenterAndSize( mRect.getCenterX() - 2, mRect.getCenterY() + 40, mRect.getWidth() + 6, mRect.getHeight() - 78 );
+                htmlRect.setCenterAndSize( getRect().getCenterX() - 2, getRect().getCenterY() + 40, getRect().getWidth() + 6, getRect().getHeight() - 78 );
 #endif
                 web_browser->setRect( htmlRect );
                 web_browser->reshape( htmlRect.getWidth(), htmlRect.getHeight(), TRUE );
-                reshape( mRect.getWidth(), mRect.getHeight(), 1 );
+                reshape( getRect().getWidth(), getRect().getHeight(), 1 );
 
                 // kick off a request to grab the url manually
                 gResponsePtr = LLIamHereLogin::build( this );
                 std::string login_page = LLAppViewer::instance()->getLoginPage();
                 if (login_page.empty())
                 {
-                        login_page = childGetValue( "real_url" ).asString();
+                        login_page = getString( "real_url" );
                 }
                 LLHTTPClient::head( login_page, gResponsePtr );
         };
-        #else
-                mHtmlAvailable = FALSE;
-        #endif
 
 #if !USE_VIEWER_AUTH
         // Initialize visibility (and don't force visibility - use prefs)
@@ -493,8 +488,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
 
 void LLPanelLogin::setSiteIsAlive( bool alive )
 {
-#if LL_LIBXUL_ENABLED
-        LLWebBrowserCtrl* web_browser = LLUICtrlFactory::getWebBrowserCtrlByName(this, "login_html");
+        LLWebBrowserCtrl* web_browser = getChild<LLWebBrowserCtrl>("login_html");
         // if the contents of the site was retrieved
         if ( alive )
         {
@@ -529,10 +523,6 @@ void LLPanelLogin::setSiteIsAlive( bool alive )
                 }
 #endif
         }
-
-#else
-        mHtmlAvailable = FALSE;
-#endif
 }
 
 void LLPanelLogin::mungePassword(LLUICtrl* caller, void* user_data)
@@ -571,16 +561,16 @@ void LLPanelLogin::draw()
         glPushMatrix();
         {
                 F32 image_aspect = 1.333333f;
-                F32 view_aspect = (F32)mRect.getWidth() / (F32)mRect.getHeight();
+                F32 view_aspect = (F32)getRect().getWidth() / (F32)getRect().getHeight();
                 // stretch image to maintain aspect ratio
                 if (image_aspect > view_aspect)
                 {
-                        glTranslatef(-0.5f * (image_aspect / view_aspect - 1.f) * mRect.getWidth(), 0.f, 0.f);
+                        glTranslatef(-0.5f * (image_aspect / view_aspect - 1.f) * getRect().getWidth(), 0.f, 0.f);
                         glScalef(image_aspect / view_aspect, 1.f, 1.f);
                 }
 
-                S32 width = mRect.getWidth();
-                S32 height = mRect.getHeight();
+                S32 width = getRect().getWidth();
+                S32 height = getRect().getHeight();
 
                 if ( mHtmlAvailable )
                 {
@@ -626,7 +616,6 @@ BOOL LLPanelLogin::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
                         return TRUE;
                 }
                 
-#if LL_LIBXUL_ENABLED
                 if ( KEY_F1 == key )
                 {
                         llinfos << "Spawning HTML help window" << llendl;
@@ -642,7 +631,6 @@ BOOL LLPanelLogin::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
                         tos_dialog->startModal();
                         return TRUE;
                 }
-# endif
 #endif
 
                 if (!called_from_parent)
@@ -923,14 +911,12 @@ void LLPanelLogin::setAlwaysRefresh(bool refresh)
 {
         if (LLStartUp::getStartupState() >= STATE_LOGIN_CLEANUP) return;
 
-#if LL_LIBXUL_ENABLED
-        LLWebBrowserCtrl* web_browser = LLUICtrlFactory::getWebBrowserCtrlByName(sInstance, "login_html");
+        LLWebBrowserCtrl* web_browser = sInstance->getChild<LLWebBrowserCtrl>("login_html");
 
         if (web_browser)
         {
                 web_browser->setAlwaysRefresh(refresh);
         }
-#endif
 }
 
 
@@ -944,7 +930,7 @@ void LLPanelLogin::loadLoginPage()
         std::string login_page = LLAppViewer::instance()->getLoginPage();
         if (login_page.empty())
         {
-                login_page = sInstance->childGetValue( "real_url" ).asString();
+                login_page = sInstance->getString( "real_url" );
         }
         oStr << login_page;
         
@@ -1056,18 +1042,15 @@ void LLPanelLogin::loadLoginPage()
 #endif
 #endif
         
-#if LL_LIBXUL_ENABLED
-        LLWebBrowserCtrl* web_browser = LLUICtrlFactory::getWebBrowserCtrlByName(sInstance, "login_html");
+        LLWebBrowserCtrl* web_browser = sInstance->getChild<LLWebBrowserCtrl>("login_html");
         
         // navigate to the "real" page 
         web_browser->navigateTo( oStr.str() );
-#endif
 }
 
-#if LL_LIBXUL_ENABLED
 void LLPanelLogin::onNavigateComplete( const EventType& eventIn )
 {
-        LLWebBrowserCtrl* web_browser = LLUICtrlFactory::getWebBrowserCtrlByName(sInstance, "login_html");
+        LLWebBrowserCtrl* web_browser = sInstance->getChild<LLWebBrowserCtrl>("login_html");
         if (web_browser)
         {
                 // *HACK HACK HACK HACK!
@@ -1080,7 +1063,6 @@ void LLPanelLogin::onNavigateComplete( const EventType& eventIn )
                 //web_browser->handleKey(KEY_TAB, MASK_NONE, false);
         }
 }
-#endif
 
 //---------------------------------------------------------------------------
 // Protected methods
@@ -1181,7 +1163,7 @@ void LLPanelLogin::onClickForgotPassword(void*)
 {
         if (sInstance )
         {
-                LLWeb::loadURL(sInstance->childGetValue( "forgot_password_url" ).asString());
+                LLWeb::loadURL(sInstance->getString( "forgot_password_url" ));
         }
 }