Merge remote branch 'thickbrick/weekly' into weekly

5 files changed, 53 insertions, 573 deletions

diff --git a/linden/indra/newview/hippolimits.cpp b/linden/indra/newview/hippolimits.cpp
index 851e191..3368ba4 100644
--- a/linden/indra/newview/hippolimits.cpp
+++ b/linden/indra/newview/hippolimits.cpp
@@ -21,7 +21,8 @@ HippoLimits::HippoLimits()
         mMaxHollow(0.95f),
         mMinPrimScale(0.001f),
         mMaxPrimScale(256.0f),
-        mMaxLinkedPrims(-1)
+        mMaxLinkedPrims(-1),
+        mMaxDragDistance(0.f)
 {
         setLimits();
 }
@@ -207,7 +208,7 @@ F32 HippoLimits::getMinPrimZPos() const
 
 F32 HippoLimits::getMaxDragDistance() const
 {
-        if (mMaxDragDistance == 0)
+        if (mMaxDragDistance == 0.f)
         {
                 return FLT_MAX;
         }
@@ -215,9 +216,9 @@ F32 HippoLimits::getMaxDragDistance() const
         {
                 F32 max_drag_distance = gSavedSettings.getBOOL("LimitDragDistance") ? gSavedSettings.getF32("MaxDragDistance") : FLT_MAX;
 
-                if(max_drag_distance > mMaxDragDistance) //Chose the more restrictive

-                {

-                        max_drag_distance = mMaxDragDistance;

+                if(max_drag_distance > mMaxDragDistance) //Chose the more restrictive
+                {
+                        max_drag_distance = mMaxDragDistance;
                 }
                 return max_drag_distance;
         }
diff --git a/linden/indra/newview/llfloaterhtmlhelp.cpp b/linden/indra/newview/llfloaterhtmlhelp.cpp
deleted file mode 100644
index c89c2e2..0000000
--- a/linden/indra/newview/llfloaterhtmlhelp.cpp
+++ /dev/null
@@ -1,562 +0,0 @@
-/** 
- * @file llfloaterhtmlhelp.cpp
- * @brief HTML Help floater - uses embedded web browser control
- *
- * $LicenseInfo:firstyear=2006&license=viewergpl$
- * 
- * Copyright (c) 2006-2009, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at
- * http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llfloaterhtmlhelp.h"
-#include "llfloaterhtml.h"
-
-#include "llchat.h"
-#include "llfloaterchat.h"
-#include "llparcel.h"
-#include "lluictrlfactory.h"
-#include "llwebbrowserctrl.h"
-#include "llviewerwindow.h"
-#include "llviewercontrol.h"
-#include "llviewerparcelmgr.h"
-#include "llweb.h"
-#include "lltrans.h"
-#include "llui.h"
-#include "roles_constants.h"
-
-#include "llurlhistory.h"
-#include "llwebbrowserctrl.h"
-#include "llviewermedia.h"
-#include "llviewerparcelmedia.h"
-#include "llcombobox.h"
-
-#include "hippogridmanager.h"
-
-LLFloaterMediaBrowser::LLFloaterMediaBrowser(const LLSD& media_data)
-{
-        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_media_browser.xml");
-}
-
-void LLFloaterMediaBrowser::draw()
-{
-        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());
-        }
-        LLFloater::draw();
-}
-
-BOOL LLFloaterMediaBrowser::postBuild()
-{
-        mBrowser = getChild<LLWebBrowserCtrl>("browser");
-        mBrowser->addObserver(this);
-
-        mAddressCombo = getChild<LLComboBox>("address");
-        mAddressCombo->setCommitCallback(onEnterAddress);
-        mAddressCombo->setCallbackUserData(this);
-
-        childSetAction("back", onClickBack, this);
-        childSetAction("forward", onClickForward, this);
-        childSetAction("reload", onClickRefresh, this);
-        childSetAction("go", onClickGo, this);
-        childSetAction("close", onClickClose, this);
-        childSetAction("open_browser", onClickOpenWebBrowser, this);
-        childSetAction("assign", onClickAssign, this);
-        childSetAction("home", onClickHome, this);
-        childSetAction("set_home", onClickSetHome, this);
-
-        buildURLHistory();
-
-        //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");
-        }
-        openMedia(last_url);
-
-        return TRUE;
-}
-
-void LLFloaterMediaBrowser::buildURLHistory()
-{
-        LLCtrlListInterface* url_list = childGetListInterface("address");
-        if (url_list)
-        {
-                url_list->operateOnAll(LLCtrlListInterface::OP_DELETE);
-        }
-
-        // Get all of the entries in the "parcel" collection
-        LLSD parcel_history = LLURLHistory::getURLHistory("browser");
-
-        LLSD::array_iterator iter_history =
-                parcel_history.beginArray();
-        LLSD::array_iterator end_history =
-                parcel_history.endArray();
-        for(; iter_history != end_history; ++iter_history)
-        {
-                std::string url = (*iter_history).asString();
-                if(! url.empty())
-                        url_list->addSimpleElement(url);
-        }
-}
-
-void LLFloaterMediaBrowser::onClose(bool app_quitting)
-{
-        //setVisible(FALSE);
-        destroy();
-}
-
-void LLFloaterMediaBrowser::onLocationChange( const EventType& eventIn )
-{
-        // hitting the refresh button will navigate to same URL, so don't add to address history
-        mCurrentURL = eventIn.getStringValue();
-        std::string::size_type string_start = mCurrentURL.find("://");
-        std::string truncated_url;
-        if ((string_start == std::string::npos) || (1)) // NOTE: this conditional is forced true to disable truncation DEV-9834
-        {
-                truncated_url = mCurrentURL;
-        }
-        else
-        {
-                truncated_url = mCurrentURL.substr(string_start + 3);
-        }
-        // redirects will navigate momentarily to about:blank, don't add to history
-        if (truncated_url != "about:blank")
-        {
-                mAddressCombo->remove(truncated_url);
-                mAddressCombo->add(truncated_url, ADD_SORTED);
-                mAddressCombo->selectByValue(truncated_url);
-
-                // Serialize url history
-                LLURLHistory::removeURL("browser", truncated_url);
-                LLURLHistory::addURL("browser", truncated_url);
-        }
-        childSetEnabled("back", mBrowser->canNavigateBack());
-        childSetEnabled("forward", mBrowser->canNavigateForward());
-        childSetEnabled("reload", TRUE);
-        gSavedSettings.setString("BrowserLastVisited", truncated_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)
-{
-        LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
-        self->mBrowser->navigateTo(self->mAddressCombo->getValue().asString());
-}
-
-//static 
-void LLFloaterMediaBrowser::onClickRefresh(void* user_data)
-{
-        LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
-
-        self->mAddressCombo->remove(0);
-        self->mBrowser->navigateTo(self->mCurrentURL);
-}
-
-//static 
-void LLFloaterMediaBrowser::onClickForward(void* user_data)
-{
-        LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
-
-        self->mBrowser->navigateForward();
-}
-
-//static 
-void LLFloaterMediaBrowser::onClickBack(void* user_data)
-{
-        LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
-
-        self->mBrowser->navigateBack();
-}
-
-//static 
-void LLFloaterMediaBrowser::onClickGo(void* user_data)
-{
-        LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
-
-        self->mBrowser->navigateTo(self->mAddressCombo->getValue().asString());
-}
-
-//static 
-void LLFloaterMediaBrowser::onClickClose(void* user_data)
-{
-        LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
-
-        self->close();
-}
-
-//static 
-void LLFloaterMediaBrowser::onClickOpenWebBrowser(void* user_data)
-{
-        LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
-
-        std::string url = self->mCurrentURL.empty() ? 
-                self->mBrowser->getHomePageUrl() :
-                self->mCurrentURL;
-        LLWeb::loadURLExternal(url);
-}
-
-void LLFloaterMediaBrowser::onClickAssign(void* user_data)
-{
-        LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
-
-        LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
-        if (!parcel)
-        {
-                return;
-        }
-        std::string media_url = self->mAddressCombo->getValue().asString();
-        LLStringUtil::trim(media_url);
-
-        parcel->setMediaURL(media_url);
-        parcel->setMediaType(std::string("text/html"));
-
-        // Send current parcel data upstream to server 
-        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)
-{
-        mBrowser->setHomePageUrl(media_url);
-        mBrowser->navigateTo(media_url);
-}
-
-LLViewerHtmlHelp gViewerHtmlHelp;
-
-class LLFloaterHtmlHelp :
-        public LLFloater,
-        public LLWebBrowserCtrlObserver
-{
-public:
-        LLFloaterHtmlHelp(std::string start_url, std::string title);
-        virtual ~LLFloaterHtmlHelp();
-        
-        virtual void onClose( bool app_quitting );
-        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 onClickForward( void* data );
-        static void onClickClose( void* data );
-        
-        // browser observer impls
-        virtual void onStatusTextChange( const EventType& eventIn );
-        virtual void onLocationChange( const EventType& eventIn );
-        
-        // used for some stats logging - will be removed at some point
-        static BOOL sFloaterOpened;
-
-        static bool onClickF1HelpLoadURL(const LLSD& notification, const LLSD& response);
-
-        LLWebBrowserCtrl* mWebBrowser;
-        static LLFloaterHtmlHelp* sInstance;
-        LLButton* mBackButton;
-        LLButton* mForwardButton;
-        LLButton* mCloseButton;
-        LLTextBox* mStatusText;
-        std::string mStatusTextContents;
-        std::string mCurrentUrl;
-        std::string mSupportUrl;
-};
-
-LLFloaterHtmlHelp* LLFloaterHtmlHelp::sInstance = 0;
-
-BOOL LLFloaterHtmlHelp::sFloaterOpened = FALSE;
-
-////////////////////////////////////////////////////////////////////////////////
-//
-LLFloaterHtmlHelp::LLFloaterHtmlHelp(std::string start_url, std::string title)
-:       LLFloater( std::string("HTML Help") ),
-        mWebBrowser( 0 ),
-        mStatusTextContents( LLStringUtil::null ),
-        mCurrentUrl( LLStringUtil::null )
-{
-        sInstance = this;
-                
-        // create floater from its XML definition
-        LLUICtrlFactory::getInstance()->buildFloater( this, "floater_html_help.xml" );
-                
-        childSetAction("back_btn", onClickBack, this);
-        //childSetAction("home_btn", onClickHome, this);
-        childSetAction("forward_btn", onClickForward, this);
-
-        if (!title.empty())
-        {
-                setTitle(title);
-        }
-
-        mWebBrowser = getChild<LLWebBrowserCtrl>("html_help_browser" );
-        if ( mWebBrowser )
-        {
-                // observe browser control events
-                mWebBrowser->addObserver( this );
-
-                if (start_url != "")
-                {
-                        mWebBrowser->navigateTo( start_url );
-                }
-                else
-                {
-                        // if the last page we were at before the client was closed is valid, go there and
-                        // override what is in the XML file
-                        // (not when the window was closed - it's only ever hidden - not closed)
-                        std::string lastPageUrl = gSavedSettings.getString( "HtmlHelpLastPage" );
-                        if ( lastPageUrl != "" )
-                        {
-                                mWebBrowser->navigateTo( lastPageUrl );
-                        };
-                }
-        };
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-LLFloaterHtmlHelp::~LLFloaterHtmlHelp()
-{
-        // stop observing browser events
-        if ( mWebBrowser )
-        {
-                mWebBrowser->remObserver( this );
-        };
-
-        // save position of floater
-        gSavedSettings.setRect( "HtmlHelpRect", getRect() );
-
-        // save the location we were at when SL closed 
-        gSavedSettings.setString( "HtmlHelpLastPage", mCurrentUrl );
-
-        sInstance = 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// virtual 
-void LLFloaterHtmlHelp::draw()
-{
-        // enable/disable buttons depending on state
-        if ( mWebBrowser )
-        {
-                bool enable_back = mWebBrowser->canNavigateBack();      
-                childSetEnabled( "back_btn", enable_back );
-
-                bool enable_forward = mWebBrowser->canNavigateForward();        
-                childSetEnabled( "forward_btn", enable_forward );
-        };
-
-        LLFloater::draw();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-void LLFloaterHtmlHelp::show(std::string url, std::string title)
-{
-        LLFloaterHtml* floater_html = LLFloaterHtml::getInstance();
-        floater_html->setVisible(FALSE);
-        
-        url = gHippoGridManager->getConnectedGrid()->getSupportUrl();
-        if (!url.empty()) 
-        {
-                if (gSavedSettings.getBOOL("UseExternalBrowser")) 
-                {
-                        LLSD payload;
-                        payload["url"] = url;
-                        LLNotifications::instance().add("ClickOpenF1Help", LLSD(), payload, onClickF1HelpLoadURL);
-                } 
-                else 
-                {
-                        // don't wait, just do it
-                        LLWeb::loadURLInternal(url);
-                }
-        } 
-        else 
-        {
-                LLNotifications::instance().add("NoSupportUrl");
-        }
-}
-
-// static 
-bool LLFloaterHtmlHelp::onClickF1HelpLoadURL(const LLSD& notification, const LLSD& response)
-{
-        S32 option = LLNotification::getSelectedOption(notification, response);
-        if (option == 0)
-        {
-                const std::string& url = notification["payload"]["url"].asString();
-                if (!url.empty()) 
-                {
-                        LLWeb::loadURLExternal(url);
-                } 
-                else 
-                {
-                        llwarns << "Support URL not available." << llendl;
-                }
-        }
-        return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-void LLFloaterHtmlHelp::onClose( bool app_quitting )
-{
-        setVisible( false );
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-void LLFloaterHtmlHelp::onClickClose( void* data )
-{
-        LLFloaterHtmlHelp* self = ( LLFloaterHtmlHelp* )data;
-
-        self->setVisible( false );
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-void LLFloaterHtmlHelp::onClickBack( void* data )
-{
-        LLFloaterHtmlHelp* self = ( LLFloaterHtmlHelp* )data;
-        if ( self )
-        {
-                if ( self->mWebBrowser )
-                {
-                        self->mWebBrowser->navigateBack();
-                };
-        };
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// 
-void LLFloaterHtmlHelp::onClickForward( void* data )
-{
-        LLFloaterHtmlHelp* self = ( LLFloaterHtmlHelp* )data;
-        if ( self )
-        {
-                if ( self->mWebBrowser )
-                {
-                        self->mWebBrowser->navigateForward();
-                };
-        };
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-void LLFloaterHtmlHelp::onStatusTextChange( const EventType& eventIn )
-{
-        mStatusTextContents = std::string( eventIn.getStringValue() );
-
-        childSetText("status_text", mStatusTextContents);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-void LLFloaterHtmlHelp::onLocationChange( const EventType& eventIn )
-{
-        llinfos << "WEB> Location changed to " << eventIn.getStringValue() << llendl;
-        mCurrentUrl = std::string( eventIn.getStringValue() );
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-LLViewerHtmlHelp::LLViewerHtmlHelp()
-{
-        LLUI::setHtmlHelp(this);
-}
-
-LLViewerHtmlHelp::~LLViewerHtmlHelp()
-{
-        LLUI::setHtmlHelp(NULL);
-}
-
-void LLViewerHtmlHelp::show()
-{
-        LLFloaterHtmlHelp::show("", "");
-}
-
-void LLViewerHtmlHelp::show(std::string url)
-{
-        std::string title;      // empty
-        LLFloaterHtmlHelp::show(url, title);
-}
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());