1 files changed, 40 insertions, 2 deletions

diff --git a/linden/indra/newview/llwebbrowserctrl.cpp b/linden/indra/newview/llwebbrowserctrl.cpp
index e819f21..21270ed 100644
--- a/linden/indra/newview/llwebbrowserctrl.cpp
+++ b/linden/indra/newview/llwebbrowserctrl.cpp
@@ -43,6 +43,7 @@
 #include "llfloaterhtml.h"
 #include "llweb.h"
 #include "llurlsimstring.h"
+#include "llviewercontrol.h"
 
 // linden library includes
 #include "llfocusmgr.h"
@@ -219,9 +220,8 @@ BOOL LLWebBrowserCtrl::handleMouseDown( S32 x, S32 y, MASK mask )
 //
 BOOL LLWebBrowserCtrl::handleDoubleClick( S32 x, S32 y, MASK mask )
 {
-        llinfos << "JAMESDEBUG handleDoubleClick web ctrl" << llendl;
         convertInputCoords(x, y);
-        //LLMozLib::getInstance()->mouseLeftDoubleClick( mEmbeddedBrowserWindowId, x, y );
+        LLMozLib::getInstance()->mouseLeftDoubleClick( mEmbeddedBrowserWindowId, x, y );
 
         gViewerWindow->setMouseCapture( this );
 
@@ -419,6 +419,44 @@ void LLWebBrowserCtrl::navigateTo( std::string urlIn )
         }
 }
 
+
+void LLWebBrowserCtrl::navigateToLocalPage( const std::string& subdir, const std::string& filename_in )
+{
+        std::string language = gSavedSettings.getString("Language");
+        
+        if(language == "default")
+        {
+                language = gSavedSettings.getString("SystemLanguage");
+        }
+
+        std::string delim = gDirUtilp->getDirDelimiter();
+        std::string filename;
+
+        filename += subdir;
+        filename += delim;
+        filename += filename_in;
+
+        std::string expanded_filename = gDirUtilp->getExpandedFilename(LL_PATH_HTML, language, filename);
+
+        if (gDirUtilp->fileExists(expanded_filename))
+        {
+                navigateTo(expanded_filename);
+                return;
+        }
+        if (language != "en-us")
+        {
+                expanded_filename = gDirUtilp->getExpandedFilename(LL_PATH_HTML, "en-us", filename);
+                if (gDirUtilp->fileExists(expanded_filename))
+                {
+                        navigateTo(expanded_filename);
+                        return;
+                }
+        }
+
+        llwarns << "File " << subdir << delim << filename_in << "not found" << llendl;
+}
+
+
 ////////////////////////////////////////////////////////////////////////////////
 //
 void LLWebBrowserCtrl::navigateHome()