1 files changed, 80 insertions, 20 deletions

diff --git a/linden/indra/newview/llfloaterhtmlhelp.cpp b/linden/indra/newview/llfloaterhtmlhelp.cpp
index 5337c07..2a22a40 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"
 
@@ -59,7 +62,9 @@ LLFloaterMediaBrowser::LLFloaterMediaBrowser(const LLSD& media_data)
 
 void LLFloaterMediaBrowser::draw()
 {
-        childSetEnabled("go", !mAddressCombo->getValue().asString().empty());
+        BOOL url_exists = !mAddressCombo->getValue().asString().empty();
+        childSetEnabled("go", url_exists);
+        childSetEnabled("set_home", url_exists);
         LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
         if(parcel)
         {
@@ -85,6 +90,8 @@ BOOL LLFloaterMediaBrowser::postBuild()
         childSetAction("close", onClickClose, this);
         childSetAction("open_browser", onClickOpenWebBrowser, this);
         childSetAction("assign", onClickAssign, this);
+        childSetAction("home", onClickHome, this);
+        childSetAction("set_home", onClickSetHome, this);
 
         buildURLHistory();
         return TRUE;
@@ -147,6 +154,7 @@ void LLFloaterMediaBrowser::onLocationChange( const EventType& eventIn )
         childSetEnabled("back", mBrowser->canNavigateBack());
         childSetEnabled("forward", mBrowser->canNavigateForward());
         childSetEnabled("reload", TRUE);
+        gSavedSettings.setString("BrowserLastVisited", truncated_url);
 }
 
 LLFloaterMediaBrowser* LLFloaterMediaBrowser::showInstance(const LLSD& media_url)
@@ -157,6 +165,46 @@ LLFloaterMediaBrowser* LLFloaterMediaBrowser::showInstance(const LLSD& media_url
         return floaterp;
 }
 
+//static
+void LLFloaterMediaBrowser::toggle()
+{
+        LLFloaterMediaBrowser* self = LLFloaterMediaBrowser::getInstance();
+
+        if(self->getVisible())
+        {
+                self->close();
+        }
+        else
+        {
+                //Show home url if new session, last visited if not
+                std::string last_url = gSavedSettings.getString("BrowserLastVisited");
+                if(last_url.empty()) 
+                        last_url = gSavedSettings.getString("BrowserHome");
+                showInstance(last_url);
+        }
+}
+
+//static
+void LLFloaterMediaBrowser::helpF1()
+{
+        std::string url = gSavedSettings.getString("HelpSupportURL");
+        LLSD payload;
+    payload["url"] = url;
+                
+        LLNotifications::instance().add("ClickOpenF1Help", LLSD(), payload, onClickF1HelpLoadURL);      
+}
+ 
+// static
+bool LLFloaterMediaBrowser::onClickF1HelpLoadURL(const LLSD& notification, const LLSD& response)
+{
+        S32 option = LLNotification::getSelectedOption(notification, response);
+        if (option == 0)
+        {
+                LLWeb::loadURL(notification["payload"]["url"].asString());
+        }
+        return false;
+}
+
 //static 
 void LLFloaterMediaBrowser::onEnterAddress(LLUICtrl* ctrl, void* user_data)
 {
@@ -235,8 +283,35 @@ void LLFloaterMediaBrowser::onClickAssign(void* user_data)
         LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate( parcel, true );
         // now check for video
         LLViewerParcelMedia::update( parcel );
+}
 
+// static
+void LLFloaterMediaBrowser::onClickHome(void* user_data)
+{
+        LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
+        if (self)
+        {
+                if (self->mBrowser)
+                {
+                        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);
+        }
 }
 
 void LLFloaterMediaBrowser::openMedia(const std::string& media_url)
@@ -259,8 +334,10 @@ public:
         virtual void draw();
         
         static void show(std::string url, std::string title);
+
+private:
         static void onClickBack( void* data );
-        static void onClickHome( void* data );
+        //static void onClickHome( void* data );
         static void onClickForward( void* data );
         static void onClickClose( void* data );
         
@@ -273,7 +350,6 @@ public:
 
         static bool onClickF1HelpLoadURL(const LLSD& notification, const LLSD& response);
 
-protected:
         LLWebBrowserCtrl* mWebBrowser;
         static LLFloaterHtmlHelp* sInstance;
         LLButton* mBackButton;
@@ -303,7 +379,7 @@ LLFloaterHtmlHelp::LLFloaterHtmlHelp(std::string start_url, std::string title)
         LLUICtrlFactory::getInstance()->buildFloater( this, "floater_html_help.xml" );
                 
         childSetAction("back_btn", onClickBack, this);
-        childSetAction("home_btn", onClickHome, this);
+        //childSetAction("home_btn", onClickHome, this);
         childSetAction("forward_btn", onClickForward, this);
 
         if (!title.empty())
@@ -439,22 +515,6 @@ void LLFloaterHtmlHelp::onClickBack( void* data )
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-//
-void LLFloaterHtmlHelp::onClickHome( void* data )
-{
-        LLFloaterHtmlHelp* self = ( LLFloaterHtmlHelp* )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 )
-                {
-                        web_browser->navigateHome();
-                };
-        };
-}
-
-////////////////////////////////////////////////////////////////////////////////
 // 
 void LLFloaterHtmlHelp::onClickForward( void* data )
 {