1 files changed, 26 insertions, 9 deletions

diff --git a/linden/indra/newview/llfloaterhtmlhelp.cpp b/linden/indra/newview/llfloaterhtmlhelp.cpp
index 5337c07..9f07e0f 100644
--- a/linden/indra/newview/llfloaterhtmlhelp.cpp
+++ b/linden/indra/newview/llfloaterhtmlhelp.cpp
@@ -35,6 +35,8 @@
 #include "llfloaterhtmlhelp.h"
 #include "llfloaterhtml.h"
 
+#include "llchat.h"
+#include "llfloaterchat.h"
 #include "llparcel.h"
 #include "lluictrlfactory.h"
 #include "llwebbrowserctrl.h"
@@ -42,6 +44,7 @@
 #include "llviewercontrol.h"
 #include "llviewerparcelmgr.h"
 #include "llweb.h"
+#include "lltrans.h"
 #include "llui.h"
 #include "roles_constants.h"
 
@@ -440,18 +443,32 @@ void LLFloaterHtmlHelp::onClickBack( void* data )
 
 ////////////////////////////////////////////////////////////////////////////////
 //
-void LLFloaterHtmlHelp::onClickHome( void* data )
+void LLFloaterMediaBrowser::onClickHome(void* user_data)
 {
-        LLFloaterHtmlHelp* self = ( LLFloaterHtmlHelp* )data;
-        if ( self )
+        LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
+        if (self)
         {
-                // get the home page URL (which can differ from the start URL) from XML and go there
-                LLWebBrowserCtrl* web_browser = self->getChild<LLWebBrowserCtrl>("html_help_browser" );
-                if ( web_browser )
+                if (self->mBrowser)
                 {
-                        web_browser->navigateHome();
-                };
-        };
+                        std::string home_url = gSavedSettings.getString("BrowserHome");
+                        self->mBrowser->navigateTo(home_url);
+                }
+        }
+}
+
+void LLFloaterMediaBrowser::onClickSetHome(void* user_data)
+{
+        LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
+        std::string url = self->mCurrentURL;
+        if(!url.empty())
+        {
+                LLChat chat;
+                std::string log_message = LLTrans::getString("new_home_page") + " ";
+                log_message += url;
+                chat.mText = log_message;
+                LLFloaterChat::addChat(chat, FALSE, FALSE);
+                gSavedSettings.setString("BrowserHome", url);
+        }
 }
 
 ////////////////////////////////////////////////////////////////////////////////