Second Life viewer sources 1.18.5.2-RC

1 files changed, 18 insertions, 3 deletions

diff --git a/linden/indra/newview/llwebbrowserctrl.cpp b/linden/indra/newview/llwebbrowserctrl.cpp
index ca03f48..879d229 100644
--- a/linden/indra/newview/llwebbrowserctrl.cpp
+++ b/linden/indra/newview/llwebbrowserctrl.cpp
@@ -183,7 +183,7 @@ BOOL LLWebBrowserCtrl::handleScrollWheel( S32 x, S32 y, S32 clicks )
 
         // note: this isn't really necessary right now since the page is updated
         // on a timer but if that becomes too burdensome and the page is only updated
-        // once after load then this will be nexessary
+        // once after load then this will be necessary
         LLMozLib::getInstance()->grabBrowserWindow( mEmbeddedBrowserWindowId );
 
         return TRUE;
@@ -314,7 +314,8 @@ void LLWebBrowserCtrl::onVisibilityChange ( BOOL new_visibility )
         else
         {
                 mFrequentUpdates = false;
-        };
+        }
+        LLUICtrl::onVisibilityChange(new_visibility);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -362,6 +363,20 @@ bool LLWebBrowserCtrl::canNavigateForward()
 
 ////////////////////////////////////////////////////////////////////////////////
 //
+bool LLWebBrowserCtrl::set404RedirectUrl(  std::string redirect_url )
+{
+        return LLMozLib::getInstance()->set404RedirectUrl( mEmbeddedBrowserWindowId, redirect_url );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+bool LLWebBrowserCtrl::clr404RedirectUrl()
+{
+        return LLMozLib::getInstance()->clr404RedirectUrl( mEmbeddedBrowserWindowId );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
 void LLWebBrowserCtrl::navigateTo( std::string urlIn )
 {
         const std::string protocol( "secondlife://" );
@@ -420,7 +435,7 @@ void LLWebBrowserCtrl::draw()
                 return;
 
         // NOTE: optimization needed here - probably only need to do this once
-        // unless tearoffs change the parent which they problably do.
+        // unless tearoffs change the parent which they probably do.
         LLUICtrl* ptr = (LLUICtrl*)findRootMostFocusRoot();
         if ( ptr && ptr->hasFocus() )
         {