3 files changed, 47 insertions, 6 deletions

diff --git a/linden/indra/newview/llfloatermediabrowser.cpp b/linden/indra/newview/llfloatermediabrowser.cpp
index def0159..d658a11 100644
--- a/linden/indra/newview/llfloatermediabrowser.cpp
+++ b/linden/indra/newview/llfloatermediabrowser.cpp
@@ -35,6 +35,8 @@
 #include "llfloatermediabrowser.h"
 #include "llfloaterhtml.h"
 
+#include "llchat.h"
+#include "llfloaterchat.h"
 #include "llparcel.h"
 #include "llpluginclassmedia.h"
 #include "lluictrlfactory.h"
@@ -43,6 +45,7 @@
 #include "llviewercontrol.h"
 #include "llviewerparcelmgr.h"
 #include "llweb.h"
+#include "lltrans.h"
 #include "llui.h"
 #include "roles_constants.h"
 
@@ -64,12 +67,14 @@ 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)
         {
                 childSetVisible("parcel_owner_controls", LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_CHANGE_MEDIA));
-                childSetEnabled("assign", !mAddressCombo->getValue().asString().empty());
+                childSetEnabled("assign", url_exists);
         }
         bool show_time_controls = false;
         bool media_playing = false;
@@ -118,8 +123,11 @@ 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;
 }
 
@@ -283,6 +291,37 @@ void LLFloaterMediaBrowser::onClickAssign(void* user_data)
         }
         LLViewerParcelMedia::sendMediaNavigateMessage(media_url);
 }
+
+// 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);
+                }
+        }
+}
+
+// static
+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);
+        }
+}
+
 //static 
 void LLFloaterMediaBrowser::onClickRewind(void* user_data)
 {
diff --git a/linden/indra/newview/llfloatermediabrowser.h b/linden/indra/newview/llfloatermediabrowser.h
index 8a78df8..7de1900 100644
--- a/linden/indra/newview/llfloatermediabrowser.h
+++ b/linden/indra/newview/llfloatermediabrowser.h
@@ -85,6 +85,8 @@ public:
         static void onClickClose(void* user_data);
         static void onClickOpenWebBrowser(void* user_data);
         static void onClickAssign(void* user_data);
+        static void onClickHome(void* user_data);
+        static void onClickSetHome(void* user_data);
         static void onClickRewind(void* user_data);
         static void onClickPlay(void* user_data);
         static void onClickStop(void* user_data);
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index a663e60..b81a2a2 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -6091,10 +6091,10 @@ class LLShowFloater : public view_listener_t
                 {
                         JCFloaterAnimList::toggleInstance(LLSD());
                 }
-//imprudence fixme              else if (floater_name == "inworld browser")
-//              {
-//                      LLFloaterMediaBrowser::toggle();
-//              }
+                else if (floater_name == "inworld browser")
+                {
+                        LLWeb::loadURL(gSavedSettings.getString("BrowserHome"));
+                }
                 else if (floater_name == "beacons")
                 {
                         LLFloaterBeacons::toggleInstance(LLSD());