65 files changed, 1564 insertions, 361 deletions
diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index 8aab5c8..6a41ddf 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -528,6 +528,7 @@ Robin Cornelius
        SNOW-108
        SNOW-196
        SNOW-422
+        SNOW-466
        SNOW-485
        VWR-2488
        VWR-9557
diff --git a/linden/indra/llinventory/llparcel.cpp b/linden/indra/llinventory/llparcel.cpp
index 39605eb..4cbb83a 100644
--- a/linden/indra/llinventory/llparcel.cpp
+++ b/linden/indra/llinventory/llparcel.cpp
@@ -195,8 +195,6 @@ void LLParcel::init(const LLUUID &owner_id,
        mMediaID.setNull();
        mMediaAutoScale = 0;
        mMediaLoop = TRUE;
-        mObscureMedia = 1;
-        mObscureMusic = 1;
        mMediaWidth = 0;
        mMediaHeight = 0;
        setMediaCurrentURL(LLStringUtil::null);
@@ -691,8 +689,8 @@ void LLParcel::packMessage(LLSD& msg)
        msg["auto_scale"] = getMediaAutoScale();
        msg["media_loop"] = getMediaLoop();
        msg["media_current_url"] = getMediaCurrentURL();
-        msg["obscure_media"] = getObscureMedia();
+        msg["obscure_media"] = FALSE; // OBSOLETE - no longer used
-        msg["obscure_music"] = getObscureMusic();
+        msg["obscure_music"] = FALSE; // OBSOLETE - no longer used
        msg["media_id"] = getMediaID();
        msg["media_allow_navigate"] = getMediaAllowNavigate();
        msg["media_prevent_camera_zoom"] = getMediaPreventCameraZoom();
@@ -757,8 +755,6 @@ void LLParcel::unpackMessage(LLMessageSystem* msg)
                msg->getS32("MediaData", "MediaWidth", mMediaWidth);
                msg->getS32("MediaData", "MediaHeight", mMediaHeight);
                msg->getU8 ( "MediaData", "MediaLoop", mMediaLoop );
-                msg->getU8 ( "MediaData", "ObscureMedia", mObscureMedia );
-                msg->getU8 ( "MediaData", "ObscureMusic", mObscureMusic );
        }
        else
        {
@@ -766,8 +762,6 @@ void LLParcel::unpackMessage(LLMessageSystem* msg)
                                                // thats what we want -- AW
                setMediaDesc(std::string("No Description available without Server Upgrade"));
                mMediaLoop = true;
-                mObscureMedia = true;
-                mObscureMusic = true;
        }
        if(msg->getNumberOfBlocks("MediaLinkSharing") > 0)
@@ -1233,8 +1227,6 @@ void LLParcel::clearParcel()
    setMediaDesc(LLStringUtil::null);
        setMediaAutoScale(0);
        setMediaLoop(TRUE);
-        mObscureMedia = 1;
-        mObscureMusic = 1;
        mMediaWidth = 0;
        mMediaHeight = 0;
        setMediaCurrentURL(LLStringUtil::null);
diff --git a/linden/indra/llinventory/llparcel.h b/linden/indra/llinventory/llparcel.h
index f102ec4..52f97de 100644
--- a/linden/indra/llinventory/llparcel.h
+++ b/linden/indra/llinventory/llparcel.h
@@ -244,8 +244,6 @@ public:
        void    setMediaID(const LLUUID& id) { mMediaID = id; }
        void    setMediaAutoScale ( U8 flagIn ) { mMediaAutoScale = flagIn; }
        void    setMediaLoop (U8 loop) { mMediaLoop = loop; }
-        void    setObscureMedia( U8 flagIn ) { mObscureMedia = flagIn; }
-        void    setObscureMusic( U8 flagIn ) { mObscureMusic = flagIn; }
        void setMediaWidth(S32 width);
        void setMediaHeight(S32 height);
        void setMediaCurrentURL(const std::string& url);
@@ -352,8 +350,6 @@ public:
        U8                              getMediaAutoScale() const       { return mMediaAutoScale; }
        U8              getMediaLoop() const        { return mMediaLoop; }
        const std::string&  getMediaCurrentURL() const { return mMediaCurrentURL; }
-        U8                              getObscureMedia() const         { return mObscureMedia; }
-        U8                              getObscureMusic() const         { return mObscureMusic; }
        U8              getMediaURLFilterEnable() const   { return mMediaURLFilterEnable; }
        LLSD            getMediaURLFilterList() const     { return mMediaURLFilterList; }
        U8              getMediaAllowNavigate() const { return mMediaAllowNavigate; }
@@ -645,8 +641,6 @@ protected:
        U8                                      mMediaAutoScale;
        U8                  mMediaLoop;
        std::string         mMediaCurrentURL;
-        U8                                      mObscureMedia;
-        U8                                      mObscureMusic;
        LLUUID                          mMediaID;
        U8                  mMediaURLFilterEnable;
        LLSD                mMediaURLFilterList;
diff --git a/linden/indra/llrender/llfontgl.cpp b/linden/indra/llrender/llfontgl.cpp
index 7baec81..306c6b9 100644
--- a/linden/indra/llrender/llfontgl.cpp
+++ b/linden/indra/llrender/llfontgl.cpp
@@ -242,7 +242,8 @@ BOOL LLFontGL::initDefaultFonts(F32 screen_dpi, F32 x_scale, F32 y_scale,
        // This is primarily for error detection purposes.
        succ &= (NULL != getFontSansSerifSmall());
        succ &= (NULL != getFontSansSerif());
-        succ &= (NULL != getFontSansSerifBig());
+        succ &= (NULL != getFontSansSerifBigger());
+        succ &= (NULL != getFontSansSerifLarge());
        succ &= (NULL != getFontSansSerifHuge());
        succ &= (NULL != getFontSansSerifBold());
        succ &= (NULL != getFontMonospace());
@@ -313,7 +314,13 @@ LLFontGL* LLFontGL::getFontSansSerif()
 }
 //static
-LLFontGL* LLFontGL::getFontSansSerifBig()
+LLFontGL* LLFontGL::getFontSansSerifBigger()
+{
+        return getFont(LLFontDescriptor("SansSerif","Bigger",0));
+}
+//static
+LLFontGL* LLFontGL::getFontSansSerifLarge()
 {
        return getFont(LLFontDescriptor("SansSerif","Large",0));
 }
diff --git a/linden/indra/llrender/llfontgl.h b/linden/indra/llrender/llfontgl.h
index 6cb1727..e3a953b 100644
--- a/linden/indra/llrender/llfontgl.h
+++ b/linden/indra/llrender/llfontgl.h
@@ -233,7 +233,8 @@ public:
        static LLFontGL* getFontMonospace();
        static LLFontGL* getFontSansSerifSmall();
        static LLFontGL* getFontSansSerif();
-        static LLFontGL* getFontSansSerifBig();
+        static LLFontGL* getFontSansSerifBigger();
+        static LLFontGL* getFontSansSerifLarge();
        static LLFontGL* getFontSansSerifHuge();
        static LLFontGL* getFontSansSerifBold();
        static LLFontGL* getFontExtChar();
diff --git a/linden/indra/llui/llcombobox.cpp b/linden/indra/llui/llcombobox.cpp
index be34325..a93dc9b 100644
--- a/linden/indra/llui/llcombobox.cpp
+++ b/linden/indra/llui/llcombobox.cpp
@@ -43,6 +43,7 @@
 // newview includes
 #include "llbutton.h"
+#include "llfont.h"
 #include "llkeyboard.h"
 #include "llscrolllistctrl.h"
 #include "llwindow.h"
@@ -60,7 +61,7 @@ S32 MAX_COMBO_WIDTH = 500;
 static LLRegisterWidget<LLComboBox> r1("combo_box");
-LLComboBox::LLComboBox( const std::string& name, const LLRect &rect, const std::string& label,
+LLComboBox::LLComboBox( const std::string& name, const LLRect &rect, const std::string& label, const LLFontGL* font,
        void (*commit_callback)(LLUICtrl*,void*),
        void *callback_userdata
        )
@@ -76,6 +77,15 @@ LLComboBox::LLComboBox(	const std::string& name, const LLRect &rect, const std::
        mTextEntryCallback( NULL ),
        mLabel(label)
 {
+        if (font)
+        {
+                mGLFont = font;
+        }
+        else
+        {
+                mGLFont = LLFontGL::getFontSansSerifSmall();
+        }
        // Always use text box 
        // Text label button
        mButton = new LLButton(mLabel,
@@ -89,14 +99,14 @@ LLComboBox::LLComboBox(	const std::string& name, const LLRect &rect, const std::
        mButton->setScaleImage(TRUE);
        mButton->setMouseDownCallback(onButtonDown);
-        mButton->setFont(LLFontGL::getFontSansSerifSmall());
+        mButton->setFont(mGLFont);
        mButton->setFollows(FOLLOWS_LEFT | FOLLOWS_BOTTOM | FOLLOWS_RIGHT);
        mButton->setHAlign( LLFontGL::LEFT );
        mButton->setRightHPad(2);
        addChild(mButton);
        // disallow multiple selection
-        mList = new LLScrollListCtrl(std::string("ComboBox"), LLRect(), 
+        mList = new LLScrollListCtrl(std::string("ComboBox"), LLRect(), mGLFont,
                                                                 &LLComboBox::onItemSelected, this, FALSE);
        mList->setVisible(FALSE);
        mList->setBgWriteableColor( LLColor4(1,1,1,1) );
@@ -167,11 +177,14 @@ LLView* LLComboBox::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *
        S32 max_chars = 20;
        node->getAttributeS32("max_chars", max_chars);
+        LLFontGL* font = LLView::selectFont(node);
        LLUICtrlCallback callback = NULL;
        LLComboBox* combo_box = new LLComboBox(name,
                                                        rect, 
                                                        label,
+                                                        font,
                                                        callback,
                                                        NULL);
        combo_box->setAllowTextEntry(allow_text_entry, max_chars);
@@ -540,7 +553,7 @@ void LLComboBox::updateLayout()
                        mTextEntry = new LLLineEditor(std::string("combo_text_entry"),
                                                                                text_entry_rect,
                                                                                LLStringUtil::null,
-                                                                                LLFontGL::getFontSansSerifSmall(),
+                                                                                mGLFont,
                                                                                mMaxChars,
                                                                                onTextCommit,
                                                                                onTextEntry,
@@ -1153,7 +1166,7 @@ LLFlyoutButton::LLFlyoutButton(
                const std::string& label,
                void (*commit_callback)(LLUICtrl*, void*) ,
                void *callback_userdata)
-:               LLComboBox(name, rect, LLStringUtil::null, commit_callback, callback_userdata),
+:               LLComboBox(name, rect, LLStringUtil::null, NULL, commit_callback, callback_userdata),
                mToggleState(FALSE),
                mActionButton(NULL)
 {
@@ -1214,6 +1227,8 @@ LLXMLNodePtr LLFlyoutButton::getXML(bool save_children) const
                }
        }
+        node->createChild("font", TRUE)->setStringValue(LLFontGL::nameFromFont(mGLFont));
        return node;
 }
diff --git a/linden/indra/llui/llcombobox.h b/linden/indra/llui/llcombobox.h
index 95ad17a..596f659 100644
--- a/linden/indra/llui/llcombobox.h
+++ b/linden/indra/llui/llcombobox.h
@@ -67,7 +67,8 @@ public:
        LLComboBox(
                const std::string& name, 
                const LLRect &rect,
-                const std::string& label,
+                const std::string& label, 
+                const LLFontGL* font = NULL,
                void (*commit_callback)(LLUICtrl*, void*) = NULL,
                void *callback_userdata = NULL
                );
@@ -190,6 +191,7 @@ protected:
        EPreferredPosition      mListPosition;
        LLPointer<LLUIImage>    mArrowImage;
        std::string                     mLabel;
+        const LLFontGL*         mGLFont;
 private:
        S32                                     mButtonPadding;
diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp
index 76b8927..a21ad5d 100644
--- a/linden/indra/llui/lllineeditor.cpp
+++ b/linden/indra/llui/lllineeditor.cpp
@@ -2696,7 +2696,6 @@ BOOL LLLineEditor::prevalidatePrintableNotPipe(const LLWString &str)
        return rv;
 }
 // static
 BOOL LLLineEditor::prevalidatePrintableNoSpace(const LLWString &str)
 {
@@ -2721,6 +2720,25 @@ BOOL LLLineEditor::prevalidatePrintableNoSpace(const LLWString &str)
 }
 // static
+BOOL LLLineEditor::prevalidatePrintableSpace(const LLWString &str)
+{
+        BOOL rv = TRUE;
+        S32 len = str.length();
+        if(len == 0) return rv;
+        while(len--)
+        {
+                if( !(LLStringOps::isAlnum((char)str[len]) ||
+                      LLStringOps::isPunct((char)str[len]) ||
+                          ' ' == str[len]) )
+                {
+                        rv = FALSE;
+                        break;
+                }
+        }
+        return rv;
+}
+// static
 BOOL LLLineEditor::prevalidateASCII(const LLWString &str)
 {
        BOOL rv = TRUE;
diff --git a/linden/indra/llui/lllineeditor.h b/linden/indra/llui/lllineeditor.h
index d217859..43ce869 100644
--- a/linden/indra/llui/lllineeditor.h
+++ b/linden/indra/llui/lllineeditor.h
@@ -253,6 +253,7 @@ public:
        static BOOL             prevalidateAlphaNumSpace(const LLWString &str );
        static BOOL             prevalidatePrintableNotPipe(const LLWString &str); 
        static BOOL             prevalidatePrintableNoSpace(const LLWString &str);
+        static BOOL             prevalidatePrintableSpace(const LLWString &str);
        static BOOL             prevalidateASCII(const LLWString &str);
        static BOOL             postvalidateFloat(const std::string &str);
diff --git a/linden/indra/llui/llresmgr.cpp b/linden/indra/llui/llresmgr.cpp
index 32d3d1f..22610ca 100644
--- a/linden/indra/llui/llresmgr.cpp
+++ b/linden/indra/llui/llresmgr.cpp
@@ -58,7 +58,8 @@ LLResMgr::LLResMgr()
        mUSAFonts[ LLFONT_OCRA ]                        = LLFontGL::getFontMonospace();
        mUSAFonts[ LLFONT_SANSSERIF ]           = LLFontGL::getFontSansSerif();
        mUSAFonts[ LLFONT_SANSSERIF_SMALL ]     = LLFontGL::getFontSansSerifSmall();
-        mUSAFonts[ LLFONT_SANSSERIF_BIG ]       = LLFontGL::getFontSansSerifBig();
+        mUSAFonts[ LLFONT_SANSSERIF_BIGGER ]= LLFontGL::getFontSansSerifBigger();
+        mUSAFonts[ LLFONT_SANSSERIF_LARGE ]     = LLFontGL::getFontSansSerifLarge();
        mUSAFonts[ LLFONT_SMALL ]                       = LLFontGL::getFontMonospace();
 /*
        // USA Strings
@@ -421,7 +422,8 @@ const std::string LLFONT_ID_NAMES[] =
        std::string("OCRA"),
        std::string("SANSSERIF"),
        std::string("SANSSERIF_SMALL"),
-        std::string("SANSSERIF_BIG"),
+        std::string("SANSSERIF_BIGGER"),
+        std::string("SANSSERIF_LARGE"),
        std::string("SMALL"),
 };
diff --git a/linden/indra/llui/llresmgr.h b/linden/indra/llui/llresmgr.h
index d54505c..3008244 100644
--- a/linden/indra/llui/llresmgr.h
+++ b/linden/indra/llui/llresmgr.h
@@ -51,7 +51,8 @@ enum LLFONT_ID
        LLFONT_OCRA,
        LLFONT_SANSSERIF,
        LLFONT_SANSSERIF_SMALL,
-        LLFONT_SANSSERIF_BIG,
+        LLFONT_SANSSERIF_BIGGER,
+        LLFONT_SANSSERIF_LARGE,
        LLFONT_SMALL,
        LLFONT_COUNT    // Number of values in this enum.  Keep at end.
 };
diff --git a/linden/indra/llui/llscrolllistctrl.cpp b/linden/indra/llui/llscrolllistctrl.cpp
index 1248a9a..1b93abf 100644
--- a/linden/indra/llui/llscrolllistctrl.cpp
+++ b/linden/indra/llui/llscrolllistctrl.cpp
@@ -570,7 +570,7 @@ void LLScrollListItemSeparator::draw(const LLRect& rect, const LLColor4& fg_colo
 // LLScrollListCtrl
 //---------------------------------------------------------------------------
-LLScrollListCtrl::LLScrollListCtrl(const std::string& name, const LLRect& rect,
+LLScrollListCtrl::LLScrollListCtrl(const std::string& name, const LLRect& rect, const LLFontGL* font,
        void (*commit_callback)(LLUICtrl* ctrl, void* userdata),
        void* callback_user_data,
        BOOL allow_multiple_selection,
@@ -619,6 +619,15 @@ LLScrollListCtrl::LLScrollListCtrl(const std::string& name, const LLRect& rect,
        mOriginalSelection(-1),
        mDrewSelected(FALSE)
 {
+        if (font)
+        {
+                mGLFont = font;
+        }
+        else
+        {
+                mGLFont = LLFontGL::getFontSansSerifSmall();
+        }
        mItemListRect.setOriginAndSize(
                mBorderThickness,
                mBorderThickness,
@@ -987,14 +996,14 @@ void LLScrollListCtrl::calcColumnWidths()
                column->setWidth(new_width);
                // update max content width for this column, by looking at all items
-                column->mMaxContentWidth = column->mHeader ? LLFontGL::getFontSansSerifSmall()->getWidth(column->mLabel) + mColumnPadding + HEADING_TEXT_PADDING : 0;
+                column->mMaxContentWidth = column->mHeader ? mGLFont->getWidth(column->mLabel) + mColumnPadding + HEADING_TEXT_PADDING : 0;
                item_list::iterator iter;
                for (iter = mItemList.begin(); iter != mItemList.end(); iter++)
                {
                        LLScrollListCell* cellp = (*iter)->getColumn(column->mIndex);
                        if (!cellp) continue;
-                        column->mMaxContentWidth = llmax(LLFontGL::getFontSansSerifSmall()->getWidth(cellp->getValue().asString()) + mColumnPadding + COLUMN_TEXT_PADDING, column->mMaxContentWidth);
+                        column->mMaxContentWidth = llmax(mGLFont->getWidth(cellp->getValue().asString()) + mColumnPadding + COLUMN_TEXT_PADDING, column->mMaxContentWidth);
                }
                max_item_width += column->mMaxContentWidth;
@@ -1642,7 +1651,7 @@ LLScrollListItem* LLScrollListCtrl::addStringUUIDItem(const std::string& item_te
        if (getItemCount() < mMaxItemCount)
        {
                item = new LLScrollListItem( enabled, NULL, id );
-                item->addColumn(item_text, LLResMgr::getInstance()->getRes(LLFONT_SANSSERIF_SMALL), column_width);
+                item->addColumn(item_text, mGLFont, column_width);
                addItem( item, pos );
        }
        return item;
@@ -2900,6 +2909,7 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
        LLScrollListCtrl* scroll_list = new LLScrollListCtrl(
                name,
                rect,
+                NULL,
                callback,
                NULL,
                multi_select,
@@ -3374,7 +3384,11 @@ LLScrollListItem* LLScrollListCtrl::addElement(const LLSD& value, EAddPosition p
                const LLFontGL *font = LLResMgr::getInstance()->getRes(fontname);
                if (!font)
                {
-                        font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL );
+                        font = mGLFont;
+                        if (!font)
+                        {
+                                font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL );
+                        }
                }
                U8 font_style = LLFontGL::getStyleFromString(fontstyle);
@@ -3446,7 +3460,7 @@ LLScrollListItem* LLScrollListCtrl::addElement(const LLSD& value, EAddPosition p
                if (new_item->getColumn(column_idx) == NULL)
                {
                        LLScrollListColumn* column_ptr = &column_it->second;
-                        new_item->setColumn(column_idx, new LLScrollListText(LLStringUtil::null, LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL ), column_ptr->getWidth(), LLFontGL::NORMAL));
+                        new_item->setColumn(column_idx, new LLScrollListText(LLStringUtil::null, mGLFont, column_ptr->getWidth(), LLFontGL::NORMAL));
                }
        }
@@ -3466,7 +3480,7 @@ LLScrollListItem* LLScrollListCtrl::addSimpleElement(const std::string& value, E
        LLScrollListItem *new_item = new LLScrollListItem(entry_id);
-        const LLFontGL *font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL );
+        const LLFontGL *font = mGLFont;
        new_item->addColumn(value, font, getRect().getWidth());
diff --git a/linden/indra/llui/llscrolllistctrl.h b/linden/indra/llui/llscrolllistctrl.h
index 4be7ff7..1b7105f 100644
--- a/linden/indra/llui/llscrolllistctrl.h
+++ b/linden/indra/llui/llscrolllistctrl.h
@@ -353,6 +353,7 @@ public:
        LLScrollListCtrl(
                const std::string& name,
                const LLRect& rect,
+                const LLFontGL* font,
                void (*commit_callback)(LLUICtrl*, void*),
                void* callback_userdata,
                BOOL allow_multiple_selection,
@@ -694,6 +695,8 @@ private:
        // HACK:  Did we draw one selected item this frame?
        BOOL mDrewSelected;
+        const LLFontGL* mGLFont;
 }; // end class LLScrollListCtrl
diff --git a/linden/indra/llui/llstyle.cpp b/linden/indra/llui/llstyle.cpp
index a716cbb..61a025e 100644
--- a/linden/indra/llui/llstyle.cpp
+++ b/linden/indra/llui/llstyle.cpp
@@ -128,9 +128,13 @@ void LLStyle::setFontName(const std::string& fontname)
        {
                mFontID = LLFONT_SMALL;
        }
-        else if ((fontname_lc == "sansserifbig"))
+        else if ((fontname_lc == "sansserifbigger"))
        {
-                mFontID = LLFONT_SANSSERIF_BIG;
+                mFontID = LLFONT_SANSSERIF_BIGGER;
+        }
+        else if ((fontname_lc == "sansserifhuge"))
+        {
+                mFontID = LLFONT_SANSSERIF_LARGE;
        }
        else if (fontname_lc ==  "small")
        {
diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp
index edfe33b..2f9de6b 100644
--- a/linden/indra/llwindow/llwindowsdl.cpp
+++ b/linden/indra/llwindow/llwindowsdl.cpp
@@ -632,6 +632,15 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B
                        mWindow = SDL_SetVideoMode(width, height, bits, sdlflags);
                }
+                while (!mWindow && mFSAASamples > 0)
+                {
+                        llwarns << "Window creating failed with " << mFSAASamples << "x FSAA."<<llendl;
+                        mFSAASamples = mFSAASamples>>1;
+                        SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, mFSAASamples ? 1 : 0);
+                        SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, mFSAASamples);
+                        mWindow = SDL_SetVideoMode(width, height, bits, sdlflags);
+                }
                if (!mWindow)
                {
                        llwarns << "createContext: window creation failure. SDL: " << SDL_GetError() << llendl;
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 315670c..ad9cfea 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -8063,6 +8063,17 @@
      <integer>100</integer>
    </array>
  </map>
+  <key>MediaFilterOnlyRemoteCommands</key>
+  <map>
+    <key>Comment</key>
+    <string>Whether Media Filter should only filter actions initiated remotely</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
  <key>MediaOnAPrimUI</key>
  <map>
    <key>Comment</key>
diff --git a/linden/indra/newview/hippogridmanager.cpp b/linden/indra/newview/hippogridmanager.cpp
index 74c9997..6bf6e63 100644
--- a/linden/indra/newview/hippogridmanager.cpp
+++ b/linden/indra/newview/hippogridmanager.cpp
@@ -165,6 +165,13 @@ const std::string& HippoGridInfo::getRealCurrencySymbol() const
        return mRealCurrencySymbol;
 }
+bool HippoGridInfo::isUsernameCompat() const
+{
+        // currently only SecondLife grids support username-style logins
+        // but Aurora is working on implementing it -- MC
+        return (mPlatform == HippoGridInfo::PLATFORM_SECONDLIFE);
+}
 // ********************************************************************
diff --git a/linden/indra/newview/hippogridmanager.h b/linden/indra/newview/hippogridmanager.h
index 8429dba..1b6fbc5 100644
--- a/linden/indra/newview/hippogridmanager.h
+++ b/linden/indra/newview/hippogridmanager.h
@@ -55,6 +55,7 @@ public:
        const std::string& getVoiceConnector()  const { return mVoiceConnector; }
        std::string getSearchUrl(SearchType ty, bool is_web) const;
        bool isRenderCompat()                   const;
+        bool isUsernameCompat()                                 const;
        int getMaxAgentGroups() const { return mMaxAgentGroups; }
        const std::string& getCurrencySymbol()     const;
diff --git a/linden/indra/newview/installers/windows/imprudence_installer_script.iss b/linden/indra/newview/installers/windows/imprudence_installer_script.iss
new file mode 100644
index 0000000..17428eb
--- /dev/null
+++ b/linden/indra/newview/installers/windows/imprudence_installer_script.iss
@@ -0,0 +1,193 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application.
+; Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+; These will change
+AppId={{D7736EE8-AFCE-4735-BBE3-652CDFBBFCA8}
+AppName=Imprudence
+AppVerName=Imprudence Viewer 1.3.0 RC2 (SSE2 optimized)
+DefaultDirName={pf}\Imprudence
+DefaultGroupName=Imprudence Viewer
+VersionInfoProductName=Imprudence Viewer
+OutputBaseFilename=Imprudence-1.3.0-RC2-(SSE2-optimized)-Setup
+VersionInfoVersion=1.3.0
+VersionInfoTextVersion=1.3.0
+VersionInfoProductVersion=1.3.0
+VersionInfoCopyright=2010
+AppCopyright=2010
+; These won't change
+VersionInfoCompany=Imprudence
+AppPublisher=The Imprudence Project
+AppPublisherURL=http://www.imprudenceviewer.org
+AppSupportURL=http://www.imprudenceviewer.org
+AppUpdatesURL=http://www.imprudenceviewer.org
+AllowNoIcons=true
+InfoAfterFile=..\windows\README.txt
+OutputDir=C:\
+SetupIconFile=..\windows\imp_icon.ico
+Compression=lzma2/ultra64
+InternalCompressLevel=ultra64
+SolidCompression=true
+PrivilegesRequired=poweruser
+AllowRootDirectory=true
+WizardImageFile=..\windows\imprudence_installer_icon_left.bmp
+WizardSmallImageFile=..\windows\imprudence_installer_icon_right.bmp
+SetupLogging=true
+[Languages]
+Name: english; MessagesFile: compiler:Default.isl
+[Tasks]
+Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce
+Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce
+Name: slurlassociate; Description: Associate Imprudence with SLURLs; GroupDescription: Associations:; Languages: ; Flags: checkedonce
+; TODO: use scripting for something like this on uninstall:
+; Name: uninstallsettings; Description: Remove user settings; Flags: checkablealone; Languages: ; GroupDescription: Uninstall:
+[Files]
+Source: C:\imp_1.3\imprudence.exe; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\character\*; DestDir: {app}\character; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: C:\imp_1.3\fonts\*; DestDir: {app}\fonts; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: C:\imp_1.3\app_settings\*; DestDir: {app}\app_settings; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: C:\imp_1.3\skins\*; DestDir: {app}\skins; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: C:\imp_1.3\doc\*; DestDir: {app}\doc; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: C:\imp_1.3\lib\*; DestDir: {app}\lib; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: C:\imp_1.3\alut.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\ChangeLog.txt; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\charset.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\dbghelp.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\featuretable.txt; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\freebl3.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\glew32.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\gpu_table.txt; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\iconv.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\imprudence.exe.config; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\imprudence.url; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\intl.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\js3250.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libcairo-2.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libfaad-2.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libgcrypt-11.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libgio-2.0-0.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libglib-2.0-0.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libgmodule-2.0-0.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libgnutls-26.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libgobject-2.0-0.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libgpg-error-0.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libgstapp.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libgstaudio.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libgstaudio-0.10.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libgstbase-0.10.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libgstcdda.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libgstcontroller-0.10.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libgstdataprotocol-0.10.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libgstdshow.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libgstfft.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libgstinterfaces.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libgstnet-0.10.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libgstnetbuffer.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libgstpbutils.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libgstreamer-0.10.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libgstriff.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libgstrtp.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libgstrtsp.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libgstsdp.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libgsttag.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libgstvideo.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libgthread-2.0-0.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libjpeg.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libmp3lame-0.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libneon-27.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libogg-0.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\liboil-0.3-0.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libopenjpeg-2.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libpng12-0.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libschroedinger-1.0-0.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libspeex-1.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libtheora-0.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libvorbis-0.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libvorbisenc-2.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libxml2-2.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\libxml2.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\llkdu.dll.2.config; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\Microsoft.VC80.CRT.manifest; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\msvcp80.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\msvcr80.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\nspr4.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\nss3.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\nssckbi.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\openal32.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\OpenJPEG.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\plc4.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\plds4.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\smime3.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\softokn3.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\ssl3.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\xpcom.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\xul.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\xvidcore.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\zlib1.dll; DestDir: {app}; Flags: ignoreversion
+; Voice files
+Source: C:\imp_1.3\ortp.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\SLVoice.exe; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\vivoxsdk.dll; DestDir: {app}; Flags: ignoreversion
+Source: C:\imp_1.3\wrap_oal.dll; DestDir: {app}; Flags: ignoreversion
+; Old files we don't use anymore
+; Source: C:\imp_1.3\dronesettings.xml; DestDir: {app}; Flags: ignoreversion
+; Source: C:\imp_1.3\volume_settings.xml; DestDir: {app}; Flags: ignoreversion
+; Source: C:\imp_1.3\srtp.dll; DestDir: {app}; Flags: ignoreversion
+; Source: C:\imp_1.3\ssleay32.dll; DestDir: {app}; Flags: ignoreversion
+; Source: C:\imp_1.3\tntk.dll; DestDir: {app}; Flags: ignoreversion
+; Source: C:\imp_1.3\libeay32.dll; DestDir: {app}; Flags: ignoreversion
+; Source: C:\imp_1.3\lsl_guide.html; DestDir: {app}; Flags: ignoreversion
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+;Source: C:\imp_1.3\msvcr71.dll; DestDir: {app}; Flags: ignoreversion; MinVersion: 0,6.01; Tasks: ; Languages:
+[Registry]
+Root: HKCR; Subkey: secondlife; ValueType: string; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueName: (default); ValueData: URL:Second Life
+Root: HKCR; Subkey: secondlife; ValueType: string; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueName: URL Protocol
+Root: HKCR; Subkey: secondlife\DefaultIcon; Flags: uninsdeletekey deletekey; ValueType: string; Tasks: slurlassociate; ValueData: {app}\imprudence.exe
+Root: HKCR; Subkey: secondlife\shell\open\command; ValueType: expandsz; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueData: "{app}\imprudence.exe --settings settings_imprudence.xml -url ""%1"""; Languages: 
+; Root: HKCU; Subkey: Environment; ValueType: string; ValueName: GST_PLUGIN_PATH; Flags: deletevalue uninsdeletevalue; ValueData: {app}\lib
+; Root: HKCU; Subkey: Environment; ValueType: expandsz; ValueName: PATH; ValueData: {app}
+[Icons]
+Name: {group}\{cm:UninstallProgram,Imprudence}; Filename: {uninstallexe}
+Name: {commondesktop}\Imprudence; Filename: {app}\imprudence.exe; Tasks: desktopicon; Parameters: --settings settings_imprudence.xml; WorkingDir: {app}; IconIndex: 0
+Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\Imprudence; Filename: {app}\imprudence.exe; Tasks: quicklaunchicon; Parameters: --settings settings_imprudence.xml; WorkingDir: {app}
+Name: {group}\Imprudence; Filename: {app}\imprudence.exe; WorkingDir: {app}; Comment: imprudence; IconIndex: 0; Parameters: --settings settings_imprudence.xml
+[Run]
+Filename: {app}\imprudence.exe; WorkingDir: {app}; Flags: nowait postinstall
+Filename: {app}\imprudence.url; WorkingDir: {app}; Flags: nowait postinstall shellexec; Description: See what makes Imprudence different
+[UninstallDelete]
+Name: {userappdata}\Imprudence\user_settings\password.dat; Type: files; Languages: 
+Name: {userappdata}\Imprudence\user_settings\settings.xml; Type: files; Languages: 
+Name: {userappdata}\Imprudence\user_settings\settings_imprudence.xml; Type: files; Languages: 
+; 1.2 and lower cache location:
+Name: {userappdata}\Imprudence\cache; Type: filesandordirs
+; 1.3 and higher cache location:
+Name: {localappdata}\Imprudence\cache; Type: filesandordirs
+Name: {userappdata}\Imprudence\logs; Type: filesandordirs
+Name: {userappdata}\Imprudence\browser_profile; Type: filesandordirs
+Name: C:\Users\{username}\.gstreamer-0.10; Type: filesandordirs
+Name: C:\Documents and Settings\{username}\.gstreamer-0.10; Type: filesandordirs
+[InstallDelete]
+; Name: {app}\*.dll; Type: files; Tasks: ; Languages:
+Name: {app}\lib\gstreamer-plugins\*; Type: filesandordirs; Tasks: ; Languages: 
+; Name: {app}\skins\default\xui\*; Type: filesandordirs; Tasks: ; Languages:
+; Name: {app}\skins\silver\xui\*; Type: filesandordirs; Tasks: ; Languages:
+Name: C:\Documents and Settings\{username}\.gstreamer-0.10\*; Type: filesandordirs
+Name: C:\Users\{username}\.gstreamer-0.10\*; Type: filesandordirs
+; Breaks the browser if installing on top of 1.1:
+Name: {app}\gksvggdiplus.dll; Type: files; Tasks: ; Languages:
diff --git a/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss b/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss
new file mode 100644
index 0000000..d89a074
--- /dev/null
+++ b/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss
@@ -0,0 +1,263 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application.
+; Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+; These will change
+AppId={{1B3E68BC-13EB-4277-9439-CB5FF9259460}
+AppName=Imprudence Viewer Experimental Release
+AppVerName=Imprudence Viewer 1.4.0 Experimental 2011.03.20
+DefaultDirName={pf}\ImprudenceExperimental
+DefaultGroupName=Imprudence Viewer Experimental Release
+VersionInfoProductName=Imprudence Viewer Experimental Release
+OutputBaseFilename=Imprudence-1.4.0-Experimental-2011.03.20-Setup
+VersionInfoVersion=1.4.0
+VersionInfoTextVersion=1.4.0
+VersionInfoProductVersion=1.4.0
+VersionInfoCopyright=2011
+AppCopyright=2011
+; These won't change
+VersionInfoCompany=Imprudence
+AppPublisher=The Imprudence Project
+AppPublisherURL=http://kokuaviewer.org
+AppSupportURL=http://kokuaviewer.org
+AppUpdatesURL=http://kokuaviewer.org
+AllowNoIcons=true
+InfoAfterFile=..\windows\README.txt
+OutputDir=C:\imprudence_installers
+SetupIconFile=..\windows\imp_icon.ico
+Compression=lzma2/ultra64
+InternalCompressLevel=ultra64
+SolidCompression=true
+;PrivilegesRequired=poweruser
+AllowRootDirectory=true
+WizardImageFile=..\windows\imprudence_installer_icon_left.bmp
+WizardSmallImageFile=..\windows\imprudence_installer_icon_right.bmp
+SetupLogging=true
+[Languages]
+Name: english; MessagesFile: compiler:Default.isl
+[Tasks]
+Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce
+Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce
+Name: slurlassociate; Description: Associate Imprudence with SLURLs; GroupDescription: Associations:; Languages: ; Flags: checkedonce
+; TODO: use scripting for something like this on uninstall:
+; Name: uninstallsettings; Description: Remove user settings; Flags: checkablealone; Languages: ; GroupDescription: Uninstall:
+[Files]
+Source: ..\..\..\build-vc80\newview\release\package\imprudence.exe; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\character\*; DestDir: {app}\character; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: ..\..\..\build-vc80\newview\release\package\fonts\*; DestDir: {app}\fonts; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: ..\..\..\build-vc80\newview\release\package\app_settings\*; DestDir: {app}\app_settings; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: ..\..\..\build-vc80\newview\release\package\skins\*; DestDir: {app}\skins; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: ..\..\..\build-vc80\newview\release\package\doc\*; DestDir: {app}\doc; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: ..\..\..\build-vc80\newview\release\package\llplugin\*; DestDir: {app}\llplugin; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: ..\..\..\build-vc80\newview\release\package\alut.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\ChangeLog.txt; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\dbghelp.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\featuretable.txt; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\gpu_table.txt; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\imprudence.url; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libapr-1.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libapriconv-1.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libaprutil-1.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libhunspell.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\llcommon.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\llkdu.dll.2.config; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\openal32.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\OpenJPEG.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\SLPlugin.exe; DestDir: {app}; Flags: ignoreversion
+; Gstreamer-specific files below
+Source: ..\..\..\build-vc80\newview\release\package\lib\*; DestDir: {app}\lib; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: ..\..\..\build-vc80\newview\release\package\avcodec-gpl-52.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\avdevice-gpl-52.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\avfilter-gpl-1.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\avformat-gpl-52.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\avutil-gpl-50.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\iconv.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\liba52-0.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libbz2.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libcelt-0.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libdca-0.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libexpat-1.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libfaad-2.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libFLAC-8.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libgcrypt-11.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libgio-2.0-0.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libglib-2.0-0.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libgmodule-2.0-0.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libgnutls-26.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libgobject-2.0-0.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libgpg-error-0.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libgstapp-0.10.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libgstaudio-0.10.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libgstbase-0.10.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libgstcontroller-0.10.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libgstdataprotocol-0.10.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libgstfft-0.10.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libgstinterfaces-0.10.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libgstnet-0.10.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libgstnetbuffer-0.10.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libgstpbutils-0.10.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libgstphotography-0.10.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libgstreamer-0.10.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libgstriff-0.10.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libgstrtp-0.10.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libgstrtsp-0.10.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libgstsdp-0.10.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libgstsignalprocessor-0.10.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libgsttag-0.10.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libgstvideo-0.10.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libgthread-2.0-0.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libmms-0.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libmpeg2-0.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libneon-27.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libogg-0.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\liboil-0.3-0.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libsoup-2.4-1.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libtasn1-3.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libtheora-0.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libtheoradec-1.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libvorbis-0.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libvorbisenc-2.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libvorbisfile-3.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libwavpack-1.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libx264-67.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libxml2-2.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\libxml2.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\SDL.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\xvidcore.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\z.dll; DestDir: {app}; Flags: ignoreversion
+; Voice files
+Source: ..\..\..\build-vc80\newview\release\package\ortp.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\SLVoice.exe; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\vivoxsdk.dll; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\..\build-vc80\newview\release\package\wrap_oal.dll; DestDir: {app}; Flags: ignoreversion
+; VC++ 2005 x86 redist
+Source: ..\windows\vcredist_x86_VS2005.exe; DestDir: {tmp}; DestName: vcredist_x86_2005.exe
+; Old files we don't use anymore:
+; Source: ..\..\..\build-vc80\newview\release\package\dronesettings.xml; DestDir: {app}; Flags: ignoreversion
+; Source: ..\..\..\build-vc80\newview\release\package\volume_settings.xml; DestDir: {app}; Flags: ignoreversion
+; Source: ..\..\..\build-vc80\newview\release\package\srtp.dll; DestDir: {app}; Flags: ignoreversion
+; Source: ..\..\..\build-vc80\newview\release\package\ssleay32.dll; DestDir: {app}; Flags: ignoreversion
+; Source: ..\..\..\build-vc80\newview\release\package\tntk.dll; DestDir: {app}; Flags: ignoreversion
+; Source: ..\..\..\build-vc80\newview\release\package\libeay32.dll; DestDir: {app}; Flags: ignoreversion
+; Source: ..\..\..\build-vc80\newview\release\package\lsl_guide.html; DestDir: {app}; Flags: ignoreversion
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+;Source: ..\..\..\build-vc80\newview\release\package\msvcr71.dll; DestDir: {app}; Flags: ignoreversion; MinVersion: 0,6.01; Tasks: ; Languages:
+[Icons]
+Name: {group}\{cm:UninstallProgram,Imprudence Experimental}; Filename: {uninstallexe}
+Name: {commondesktop}\Imprudence Experimental; Filename: {app}\imprudence.exe; Tasks: desktopicon; WorkingDir: {app}; IconIndex: 0
+Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\Imprudence Experimental; Filename: {app}\imprudence.exe; Tasks: quicklaunchicon; WorkingDir: {app}
+Name: {group}\Imprudence Experimental; Filename: {app}\imprudence.exe; WorkingDir: {app}; Comment: imprudence; IconIndex: 0
+[Run]
+Filename: {app}\imprudence.exe; WorkingDir: {app}; Flags: nowait postinstall
+Filename: {app}\imprudence.url; WorkingDir: {app}; Flags: nowait postinstall shellexec; Description: See what makes Imprudence different
+Filename: {tmp}\vcredist_x86_2005.exe; Parameters: "/q:a /c:""VCREDI~1.EXE /q:a /c:""""msiexec /i vcredist.msi /qn"""" """; Flags: runhidden
+[UninstallDelete]
+Name: {userappdata}\Imprudence\user_settings\password.dat; Type: files; Languages: 
+Name: {userappdata}\Imprudence\user_settings\settings.xml; Type: files; Languages: 
+Name: {userappdata}\Imprudence\user_settings\settings_imprudence_experimental.xml; Type: files; Languages: 
+; 1.2 and lower cache location:
+Name: {userappdata}\Imprudence\cache; Type: filesandordirs
+; 1.3 and higher cache location:
+Name: {localappdata}\Imprudence\cache; Type: filesandordirs
+Name: {userappdata}\Imprudence\logs; Type: filesandordirs
+Name: {userappdata}\Imprudence\browser_profile; Type: filesandordirs
+Name: C:\Users\{username}\.gstreamer-0.10; Type: filesandordirs
+Name: C:\Documents and Settings\{username}\.gstreamer-0.10; Type: filesandordirs
+[InstallDelete]
+; Name: {app}\*.dll; Type: files; Tasks: ; Languages:
+Name: {app}\lib\gstreamer-plugins\*; Type: filesandordirs; Tasks: ; Languages: 
+; Name: {app}\skins\default\xui\*; Type: filesandordirs; Tasks: ; Languages:
+; Name: {app}\skins\silver\xui\*; Type: filesandordirs; Tasks: ; Languages:
+Name: C:\Documents and Settings\{username}\.gstreamer-0.10\*; Type: filesandordirs
+Name: C:\Users\{username}\.gstreamer-0.10\*; Type: filesandordirs
+; Breaks the browser if installing on top of 1.1:
+Name: {app}\gksvggdiplus.dll; Type: files; Tasks: ; Languages: 
+; Pre-plugin files:
+Name: {app}\charset.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\freebl3.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\glew32.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\iconv.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\intl.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\js3250.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libcairo-2.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libfaad-2.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libgcrypt-11.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libgio-2.0-0.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libglib-2.0-0.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libgmodule-2.0-0.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libgnutls-26.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libgobject-2.0-0.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libgpg-error-0.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libgstapp.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libgstaudio.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libgstaudio-0.10.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libgstbase-0.10.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libgstcdda.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libgstcontroller-0.10.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libgstdataprotocol-0.10.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libgstdshow.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libgstfft.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libgstinterfaces.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libgstnet-0.10.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libgstnetbuffer.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libgstpbutils.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libgstreamer-0.10.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libgstriff.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libgstrtp.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libgstrtsp.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libgstsdp.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libgsttag.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libgstvideo.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libgthread-2.0-0.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libjpeg.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libmp3lame-0.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libneon-27.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libogg-0.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\liboil-0.3-0.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libopenjpeg-2.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libpng12-0.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libschroedinger-1.0-0.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libspeex-1.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libtheora-0.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libvorbis-0.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libvorbisenc-2.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libxml2-2.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\libxml2.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\nspr4.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\nss3.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\nssckbi.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\plc4.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\plds4.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\RELEASE_NOTES.txt; Type: files; Tasks: ; Languages: 
+Name: {app}\smime3.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\softokn3.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\ssl3.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\xpcom.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\xul.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\xvidcore.dll; Type: files; Tasks: ; Languages: 
+Name: {app}\zlib1.dll; Type: files; Tasks: ; Languages: 
+; We don't distribute the CRT like this anymore; kill old files
+Name: {app}\SLPlugin.exe.config; Type: files; Tasks: ; Languages:
+Name: {app}\Microsoft.VC80.CRT.manifest; Type: files; Tasks: ; Languages:
+Name: {app}\msvcp80.dll; Type: files; Tasks: ; Languages:
+Name: {app}\msvcr80.dll; Type: files; Tasks: ; Languages:
+Name: {app}\imprudence.exe.config; Type: files; Tasks: ; Languages:
diff --git a/linden/indra/newview/llconsole.cpp b/linden/indra/newview/llconsole.cpp
index 2379da3..2cea383 100644
--- a/linden/indra/newview/llconsole.cpp
+++ b/linden/indra/newview/llconsole.cpp
@@ -117,7 +117,7 @@ void LLConsole::setFontSize(S32 size_index)
        }
        else if (1 == size_index)
        {
-                mFont = LLFontGL::getFontSansSerifBig();
+                mFont = LLFontGL::getFontSansSerifLarge();
        }
        else
        {
diff --git a/linden/indra/newview/llfloaterpreference.cpp b/linden/indra/newview/llfloaterpreference.cpp
index 0f81be6..c99d75d 100644
--- a/linden/indra/newview/llfloaterpreference.cpp
+++ b/linden/indra/newview/llfloaterpreference.cpp
@@ -365,6 +365,7 @@ void LLPreferenceCore::setPersonalInfo(const std::string& visibility, bool im_vi
 void LLPreferenceCore::updateIsLoggedIn(bool enable)
 {
        mPrefsIM->preparePerAccountPrefs(enable);
+        mAudioPanel->updateIsLoggedIn(enable);
 }
 void LLPreferenceCore::refreshEnabledGraphics()
@@ -456,6 +457,25 @@ void LLFloaterPreference::show(void*)
 }
+// static
+void LLFloaterPreference::onClickResetPrefs(void* user_data)
+{
+        LLFloaterPreference* self = (LLFloaterPreference*)user_data;
+        LLNotifications::instance().add("ConfirmResetAllPreferences", LLSD(), LLSD(), boost::bind(callbackReset, _1, _2, self));
+}
+// static
+bool LLFloaterPreference::callbackReset(const LLSD& notification, const LLSD& response, LLFloaterPreference *self)
+{
+        S32 option = LLNotification::getSelectedOption(notification, response);
+        if ( option == 0 )
+        {
+                gSavedSettings.setBOOL("ResetAllPreferences", TRUE);
+        }
+        return false;
+}
 // static 
 void LLFloaterPreference::onBtnOK( void* userdata )
 {
diff --git a/linden/indra/newview/llfloaterpreference.h b/linden/indra/newview/llfloaterpreference.h
index 931c8b6..d5eccbc 100644
--- a/linden/indra/newview/llfloaterpreference.h
+++ b/linden/indra/newview/llfloaterpreference.h
@@ -133,6 +133,9 @@ protected:
        static void             onBtnCancel(void*);
        static void             onBtnApply(void*);
+        static void onClickResetPrefs(void* user_data);
+        static bool     callbackReset(const LLSD& notification, const LLSD& response, LLFloaterPreference* self);
        static LLFloaterPreference* sInstance;
 };
diff --git a/linden/indra/newview/llfloatertest.cpp b/linden/indra/newview/llfloatertest.cpp
index e9aada3..1934dcc 100644
--- a/linden/indra/newview/llfloatertest.cpp
+++ b/linden/indra/newview/llfloatertest.cpp
@@ -228,7 +228,9 @@ LLFloaterTestImpl::LLFloaterTestImpl()
        combo = new LLComboBox(std::string("combo"),
                LLRect(LEFT, y, LEFT+100, y-LLCOMBOBOX_HEIGHT),
                std::string("Combobox Label"),
-                onCommitCombo, this);
+                NULL,
+                onCommitCombo, 
+                this);
        combo->add(std::string("first item"));
        combo->add(std::string("second item"));
        combo->add(std::string("should go to the top"), ADD_TOP);
diff --git a/linden/indra/newview/llgroupnotify.cpp b/linden/indra/newview/llgroupnotify.cpp
index 8e98cbc..81e6c21 100644
--- a/linden/indra/newview/llgroupnotify.cpp
+++ b/linden/indra/newview/llgroupnotify.cpp
@@ -186,7 +186,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const std::string& subject,
                LLFontGL::getFontSansSerif(),
                FALSE);
-        static const LLStyleSP headerstyle(new LLStyle(true,LLColor4::black,"SansSerifBig"));
+        static const LLStyleSP headerstyle(new LLStyle(true,LLColor4::black,"SansSerifLarge"));
        static const LLStyleSP datestyle(new LLStyle(true,LLColor4::black,"serif"));
        text->appendStyledText(subject + "\n",false,false,headerstyle);
diff --git a/linden/indra/newview/llloginhandler.cpp b/linden/indra/newview/llloginhandler.cpp
index 30b05ef..c35ba04 100644
--- a/linden/indra/newview/llloginhandler.cpp
+++ b/linden/indra/newview/llloginhandler.cpp
@@ -35,6 +35,7 @@
 #include "llloginhandler.h"
 // viewer includes
+#include "hippogridmanager.h"
 #include "llpanellogin.h"                       // save_password_to_disk()
 #include "llstartup.h"                          // getStartupState()
 #include "llurlsimstring.h"
@@ -141,10 +142,27 @@ bool LLLoginHandler::handle(const LLSD& tokens,
        if (LLStartUp::getStartupState() < STATE_LOGIN_CLEANUP)  //on splash page
        {
+                // if we ever support saving names based on grid, we'll have to support saving usernames too -- MC
+                LLPanelLogin::loadLoginForm();
                if (!mFirstName.empty() || !mLastName.empty())
                {
                        // Fill in the name, and maybe the password
-                        LLPanelLogin::setFields(mFirstName, mLastName, password);
+                        if (gHippoGridManager && gHippoGridManager->getCurrentGrid()->isUsernameCompat())
+                        {
+                                if (mLastName == "resident" || mLastName == "Resident")
+                                {
+                                        LLPanelLogin::setFields(mFirstName, password);
+                                }
+                                else
+                                {
+                                        LLPanelLogin::setFields(mFirstName+"."+ mLastName, password);
+                                }
+                        }
+                        else
+                        {
+                                LLPanelLogin::setFields(mFirstName, mLastName, password);
+                        }
                }
                if (mWebLoginKey.isNull())
diff --git a/linden/indra/newview/llmediaremotectrl.cpp b/linden/indra/newview/llmediaremotectrl.cpp
index 8186293..2f6dbdf 100644
--- a/linden/indra/newview/llmediaremotectrl.cpp
+++ b/linden/indra/newview/llmediaremotectrl.cpp
@@ -172,7 +172,7 @@ void LLMediaRemoteCtrl::enableMediaButtons()
                {
                        // Set the tooltip
                        // Put this text into xui file
-                        media_url = parcel->getObscureMedia() ? mControls->getString("media_hidden_label") : parcel->getMediaURL();
+                        media_url = parcel->getMediaURL();
                        media_type = parcel->getMediaType();
                        play_media_enabled = true;
diff --git a/linden/indra/newview/llnamelistctrl.cpp b/linden/indra/newview/llnamelistctrl.cpp
index e30c129..935e6ac 100644
--- a/linden/indra/newview/llnamelistctrl.cpp
+++ b/linden/indra/newview/llnamelistctrl.cpp
@@ -54,7 +54,7 @@ LLNameListCtrl::LLNameListCtrl(const std::string& name,
                                                           BOOL draw_border,
                                                           S32 name_column_index,
                                                           const std::string& tooltip)
-:       LLScrollListCtrl(name, rect, cb, userdata, allow_multiple_selection,
+:       LLScrollListCtrl(name, rect, NULL, cb, userdata, allow_multiple_selection,
                                         draw_border),
        mNameColumnIndex(name_column_index),
        mAllowCallingCardDrop(FALSE),
diff --git a/linden/indra/newview/llpanelaudioprefs.cpp b/linden/indra/newview/llpanelaudioprefs.cpp
index f1a8af5..25e5043 100644
--- a/linden/indra/newview/llpanelaudioprefs.cpp
+++ b/linden/indra/newview/llpanelaudioprefs.cpp
@@ -55,12 +55,14 @@
 #include "llslider.h"
 #include "llsliderctrl.h"
 #include "llspinctrl.h"
+#include "llstartup.h"
 #include "lltextbox.h"
 #include "llui.h"
 #include "llviewerparcelmgr.h"
 #include "lluictrlfactory.h"
 #include "llviewerwindow.h"
 #include "llviewercontrol.h"
+#include "slfloatermediafilter.h"
 #include "hippogridmanager.h"
@@ -92,6 +94,8 @@ BOOL LLPanelAudioPrefs::postBuild()
        refreshValues(); // initialize member data from saved settings
        childSetLabelArg("L$ Change Threshold", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
        childSetValue("mute_wind_check", !gSavedSettings.getBOOL("MuteWind"));
+        childSetAction("show_media_filter", onShowMediaFilter, this);
+        updateIsLoggedIn(LLStartUp::isLoggedIn());
        return TRUE;
 }
@@ -113,7 +117,7 @@ void LLPanelAudioPrefs::refreshValues()
        mPreviousStreamingMusic = gSavedSettings.getBOOL("AudioStreamingMusic");
        mPreviousStreamingVideo = gSavedSettings.getBOOL("AudioStreamingVideo");
        mPreviousHelperWidget = gSavedSettings.getBOOL("MediaOnAPrimUI");
+        mPreviousEnableMediaFilter = gSavedSettings.getBOOL("MediaEnableFilter");
        mPreviousMuteAudio = gSavedSettings.getBOOL("MuteAudio");
        mPreviousMuteWhenMinimized = gSavedSettings.getBOOL("MuteWhenMinimized");
 }
@@ -142,7 +146,18 @@ void LLPanelAudioPrefs::cancel()
        gSavedSettings.setBOOL("AudioStreamingMusic", mPreviousStreamingMusic );
        gSavedSettings.setBOOL("AudioStreamingVideo", mPreviousStreamingVideo );
        gSavedSettings.setBOOL("MediaOnAPrimUI", mPreviousHelperWidget );
-        
+        gSavedSettings.setBOOL("MediaEnableFilter", mPreviousEnableMediaFilter );
        gSavedSettings.setBOOL("MuteAudio", mPreviousMuteAudio );
        gSavedSettings.setBOOL("MuteWhenMinimized", mPreviousMuteWhenMinimized );
 }
+//static
+void LLPanelAudioPrefs::onShowMediaFilter(void* data)
+{
+        SLFloaterMediaFilter::toggleInstance();
+}
+void LLPanelAudioPrefs::updateIsLoggedIn(const bool enable)
+{
+        childSetEnabled("show_media_filter", enable);
+}
diff --git a/linden/indra/newview/llpanelaudioprefs.h b/linden/indra/newview/llpanelaudioprefs.h
index 56982b8..a47a83e 100644
--- a/linden/indra/newview/llpanelaudioprefs.h
+++ b/linden/indra/newview/llpanelaudioprefs.h
@@ -54,6 +54,9 @@ public:
        virtual BOOL postBuild();
        static void* createVolumePanel(void* data);
+        static void onShowMediaFilter(void* data);
+        void updateIsLoggedIn(const bool);
        
 private:
        void refreshValues();
@@ -76,6 +79,7 @@ private:
        BOOL                    mPreviousStreamingMusic;
        BOOL                    mPreviousStreamingVideo;
        BOOL                    mPreviousHelperWidget;
+        BOOL                    mPreviousEnableMediaFilter;
        BOOL            mPreviousMuteAudio;
        BOOL            mPreviousMuteWhenMinimized;
 };
diff --git a/linden/indra/newview/llpanellandaudio.cpp b/linden/indra/newview/llpanellandaudio.cpp
index 0247009..8d902b6 100644
--- a/linden/indra/newview/llpanellandaudio.cpp
+++ b/linden/indra/newview/llpanellandaudio.cpp
@@ -91,9 +91,6 @@ BOOL LLPanelLandAudio::postBuild()
        mMusicURLEdit = getChild<LLLineEditor>("music_url");
        childSetCommitCallback("music_url", onCommitAny, this);
-        mMusicUrlCheck = getChild<LLCheckBoxCtrl>("hide_music_url");
-        childSetCommitCallback("hide_music_url", onCommitAny, this);
        return TRUE;
 }
@@ -117,9 +114,6 @@ void LLPanelLandAudio::refresh()
                mMusicURLEdit->setText(parcel->getMusicURL());
                mMusicURLEdit->setEnabled( can_change_media );
-                mMusicUrlCheck->set( parcel->getObscureMusic() );
-                mMusicUrlCheck->setEnabled( can_change_media );
                mCheckSoundLocal->set( parcel->getSoundLocal() );
                mCheckSoundLocal->setEnabled( can_change_media );
@@ -154,7 +148,6 @@ void LLPanelLandAudio::onCommitAny(LLUICtrl*, void *userdata)
        BOOL sound_local                = self->mCheckSoundLocal->get();
        int voice_setting               = self->mRadioVoiceChat->getSelectedIndex();
        std::string music_url   = self->mMusicURLEdit->getText();
-        U8 obscure_music                = self->mMusicUrlCheck->get();
        BOOL voice_enabled;
@@ -185,7 +178,6 @@ void LLPanelLandAudio::onCommitAny(LLUICtrl*, void *userdata)
        parcel->setParcelFlag(PF_USE_ESTATE_VOICE_CHAN, voice_estate_chan);
        parcel->setParcelFlag(PF_SOUND_LOCAL, sound_local);
        parcel->setMusicURL(music_url);
-        parcel->setObscureMusic(obscure_music);
        // Send current parcel data upstream to server
        LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate( parcel );
diff --git a/linden/indra/newview/llpanellandaudio.h b/linden/indra/newview/llpanellandaudio.h
index 3d5d633..82e27f6 100644
--- a/linden/indra/newview/llpanellandaudio.h
+++ b/linden/indra/newview/llpanellandaudio.h
@@ -55,7 +55,6 @@ private:
        LLCheckBoxCtrl* mCheckSoundLocal;
        LLRadioGroup*   mRadioVoiceChat;
        LLLineEditor*   mMusicURLEdit;
-        LLCheckBoxCtrl* mMusicUrlCheck;
        LLSafeHandle<LLParcelSelection>&        mParcel;
 };
diff --git a/linden/indra/newview/llpanellandmedia.cpp b/linden/indra/newview/llpanellandmedia.cpp
index b7df164..8a0be86 100644
--- a/linden/indra/newview/llpanellandmedia.cpp
+++ b/linden/indra/newview/llpanellandmedia.cpp
@@ -80,9 +80,7 @@ LLPanelLandMedia::LLPanelLandMedia(LLParcelSelectionHandle& parcel)
        mMediaSizeCtrlLabel(NULL),
        mMediaTextureCtrl(NULL),
        mMediaAutoScaleCheck(NULL),
-        mMediaLoopCheck(NULL),
+        mMediaLoopCheck(NULL)
-        mMediaUrlCheck(NULL),
-        mMusicUrlCheck(NULL)
 {
 }
@@ -132,12 +130,6 @@ BOOL LLPanelLandMedia::postBuild()
        mMediaLoopCheck = getChild<LLCheckBoxCtrl>("media_loop");
        childSetCommitCallback("media_loop", onCommitAny, this);
-        mMediaUrlCheck = getChild<LLCheckBoxCtrl>("hide_media_url");
-        childSetCommitCallback("hide_media_url", onCommitAny, this);
-        mMusicUrlCheck = getChild<LLCheckBoxCtrl>("hide_music_url");
-        childSetCommitCallback("hide_music_url", onCommitAny, this);
        mMediaURLEdit = getChild<LLLineEditor>("media_url");
        childSetCommitCallback("media_url", onCommitAny, this);
@@ -243,30 +235,6 @@ void LLPanelLandMedia::refresh()
                mMediaTypeCombo->setEnabled( can_change_media );
                childSetText("mime_type", mime_type);
-                mMediaUrlCheck->set( parcel->getObscureMedia() );
-                mMediaUrlCheck->setEnabled( can_change_media );
-                mMusicUrlCheck->set( parcel->getObscureMusic() );
-                mMusicUrlCheck->setEnabled( can_change_media );
-                // don't display urls if you're not able to change it
-                // much requested change in forums so people can't 'steal' urls
-                // NOTE: bug#2009 means this is still vunerable - however, bug
-                // should be closed since this bug opens up major security issues elsewhere.
-                bool obscure_media = ! can_change_media && parcel->getObscureMedia();
-                bool obscure_music = ! can_change_media && parcel->getObscureMusic();
-                // Special code to disable asterixes for html type
-                if(mime_type == "text/html")
-                {
-                        obscure_media = false;
-                        mMediaUrlCheck->set( 0 );
-                        mMediaUrlCheck->setEnabled( false );
-                }
-                mMusicURLEdit->setDrawAsterixes( obscure_music );
-                mMediaURLEdit->setDrawAsterixes( obscure_media );
                mMediaAutoScaleCheck->set( parcel->getMediaAutoScale () );
                mMediaAutoScaleCheck->setEnabled ( can_change_media );
@@ -413,8 +381,6 @@ void LLPanelLandMedia::onCommitAny(LLUICtrl*, void *userdata)
        std::string mime_type   = self->childGetText("mime_type");
        U8 media_auto_scale             = self->mMediaAutoScaleCheck->get();
        U8 media_loop           = self->mMediaLoopCheck->get();
-        U8 obscure_media                = self->mMediaUrlCheck->get();
-        U8 obscure_music                = self->mMusicUrlCheck->get();
        S32 media_width                 = (S32)self->mMediaWidthCtrl->get();
        S32 media_height                = (S32)self->mMediaHeightCtrl->get();
        LLUUID media_id                 = self->mMediaTextureCtrl->getImageAssetID();
@@ -441,8 +407,6 @@ void LLPanelLandMedia::onCommitAny(LLUICtrl*, void *userdata)
        parcel->setMediaID(media_id);
        parcel->setMediaAutoScale ( media_auto_scale );
        parcel->setMediaLoop ( media_loop );
-        parcel->setObscureMedia( obscure_media );
-        parcel->setObscureMusic( obscure_music );
        // Send current parcel data upstream to server
        LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate( parcel );
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 0b91091..e67e702 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -81,6 +81,8 @@
 #include "llglheaders.h"
+#include <boost/algorithm/string.hpp>
 // [RLVa:KB]
 #include "rlvhandler.h"
 // [/RLVa:KB]
@@ -208,6 +210,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
 #if !USE_VIEWER_AUTH
        childSetPrevalidate("first_name_edit", LLLineEditor::prevalidatePrintableNoSpace);
        childSetPrevalidate("last_name_edit", LLLineEditor::prevalidatePrintableNoSpace);
+        childSetPrevalidate("username_edit", LLLineEditor::prevalidatePrintableSpace);
        childSetCommitCallback("password_edit", mungePassword);
        childSetKeystrokeCallback("password_edit", onPassKey, this);
@@ -316,6 +319,8 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
        refreshLocation( false );
 #endif
+        loadLoginForm();
        loadNewsBar();
        LLFirstUse::useLoginScreen();
@@ -551,6 +556,26 @@ void LLPanelLogin::show(const LLRect &rect,
        LLPanelLogin::addServer(LLViewerLogin::getInstance()->getGridLabel());
 }
+// static
+void LLPanelLogin::setFields(const std::string& username, const std::string& password)
+{
+        if (!sInstance)
+        {
+                llwarns << "Attempted fillFields with no login view shown" << llendl;
+                return;
+        }
+        if (!gHippoGridManager->getCurrentGrid()->isUsernameCompat())
+        {
+                llwarns << "Trying to set a username for an incompatible grid!" << llendl;
+                return;
+        }
+        sInstance->childSetText("username_edit", username);
+        setPassword(password);
+}
 // static
 void LLPanelLogin::setFields(const std::string& firstname,
                             const std::string& lastname,
@@ -564,7 +589,13 @@ void LLPanelLogin::setFields(const std::string& firstname,
        sInstance->childSetText("first_name_edit", firstname);
        sInstance->childSetText("last_name_edit", lastname);
+        setPassword(password);
+}
+// static
+void LLPanelLogin::setPassword(const std::string& password)
+{
        // Max "actual" password length is 16 characters.
        // Hex digests are always 32 characters.
        if (password.length() == 32)
@@ -663,11 +694,25 @@ void LLPanelLogin::getFields(std::string *firstname,
                return;
        }
-        *firstname = sInstance->childGetText("first_name_edit");
+        // SL grids use a generic one-line text entry field for logins
-        LLStringUtil::trim(*firstname);
+        std::string username = sInstance->childGetText("username_edit");
+        if (!username.empty() && gHippoGridManager->getConnectedGrid()->isUsernameCompat())
+        {
+                // no need to trim here, spaces are removed
+                if (!convertUsernameToLegacy(username, *firstname, *lastname))
+                {
+                        llerrs << "Invalid username accepted! Cannot proceed!" << llendl;
+                        return;
+                }
+        }
+        else
+        {
+                *firstname = sInstance->childGetText("first_name_edit");
+                LLStringUtil::trim(*firstname);
-        *lastname = sInstance->childGetText("last_name_edit");
+                *lastname = sInstance->childGetText("last_name_edit");
-        LLStringUtil::trim(*lastname);
+                LLStringUtil::trim(*lastname);
+        }
        *password = sInstance->mMungedPassword;
 }
@@ -802,6 +847,54 @@ void LLPanelLogin::refreshLoginPage()
 }
+// static
+void LLPanelLogin::loadLoginForm()
+{
+        if (!sInstance) return;
+        
+        // toggle between username/first+last login based on grid -- MC
+        LLTextBox* firstnamet = sInstance->getChild<LLTextBox>("first_name_text");
+        LLTextBox* lastnamet = sInstance->getChild<LLTextBox>("last_name_text");
+        LLTextBox* usernamet = sInstance->getChild<LLTextBox>("username_text");
+        LLLineEditor* firstnamel = sInstance->getChild<LLLineEditor>("first_name_edit");
+        LLLineEditor* lastnamel = sInstance->getChild<LLLineEditor>("last_name_edit");
+        LLLineEditor* usernamel = sInstance->getChild<LLLineEditor>("username_edit");
+        firstnamet->setVisible(!gHippoGridManager->getCurrentGrid()->isUsernameCompat());
+        lastnamet->setVisible(!gHippoGridManager->getCurrentGrid()->isUsernameCompat());
+        usernamet->setVisible(gHippoGridManager->getCurrentGrid()->isUsernameCompat());
+        firstnamel->setVisible(!gHippoGridManager->getCurrentGrid()->isUsernameCompat());
+        lastnamel->setVisible(!gHippoGridManager->getCurrentGrid()->isUsernameCompat());
+        usernamel->setVisible(gHippoGridManager->getCurrentGrid()->isUsernameCompat());
+        // these should really REALLY be stored in the grid info -- MC
+        std::string firstnames = gSavedSettings.getString("FirstName");
+        std::string lastnames = gSavedSettings.getString("LastName");
+        if (!firstnames.empty() && !lastnames.empty())
+        {
+                if (gHippoGridManager->getCurrentGrid()->isUsernameCompat())
+                {
+                        if (lastnames == "resident" || lastnames == "Resident")
+                        {
+                                usernamel->setText(firstnames);
+                        }
+                        else
+                        {
+                                usernamel->setText(firstnames+"."+lastnames);
+                        }
+                }
+                else
+                {
+                        firstnamel->setText(firstnames);
+                        lastnamel->setText(lastnames);
+                }
+        }
+}
+// static
 void LLPanelLogin::loadLoginPage()
 {
        if (!sInstance) return;
@@ -972,6 +1065,64 @@ void LLPanelLogin::handleMediaEvent(LLPluginClassMedia* /*self*/, EMediaEvent ev
 //---------------------------------------------------------------------------
 // static
+bool LLPanelLogin::convertUsernameToLegacy(std::string& username, std::string& firstname, std::string& lastname)
+{
+        if (!username.empty())
+        {
+                // trim beginning and end
+                LLStringUtil::trim(username);
+                // minimum length for an SL grid
+                if (username.length() < 5)
+                {
+                        return false;
+                }
+        }
+        else
+        {
+                return false;
+        }
+        std::vector<std::string> names;
+        boost::algorithm::split(names, username,
+                                boost::is_any_of(std::string(" .")));
+        // maybe they typed in a few too many spaces?
+        if (names.size() > 2)
+        {
+                std::vector<std::string>::iterator vIt = names.begin();
+                while (vIt != names.end())
+                {
+                        if ((*vIt).empty())
+                        {
+                                vIt = names.erase(vIt);
+                        }
+                        else
+                        {
+                                ++vIt;
+                        }
+                }
+        }
+        if (names.size() == 1) // username
+        {
+                firstname = names[0];
+                lastname = "Resident";
+                return true;
+        }
+        else if (names.size() == 2) // first.last or first+" "+last
+        {
+                firstname = names[0];
+                lastname = names[1];
+                return true;
+        }
+        else
+        {
+                return false;
+        }
+}
+// static
 void LLPanelLogin::onClickConnect(void *)
 {
        if (sInstance && sInstance->mCallback)
@@ -983,17 +1134,48 @@ void LLPanelLogin::onClickConnect(void *)
                // JC - Make sure the fields all get committed.
                sInstance->setFocus(FALSE);
-                std::string first = sInstance->childGetText("first_name_edit");
+                // Note: valid logins are username or Username or First.Last or First Last -- MC
-                std::string last  = sInstance->childGetText("last_name_edit");
+                if (gHippoGridManager->getCurrentGrid()->isUsernameCompat())
-                if (!first.empty() && !last.empty())
                {
-                        // has both first and last name typed
+                        std::string username = sInstance->childGetText("username_edit");
-                        sInstance->mCallback(0, sInstance->mCallbackData);
+                        if (!username.empty())
+                        {
+                                // todo: make this two functions, one for validating the other for converting
+                                std::string temp1;
+                                std::string temp2;
+                                if (convertUsernameToLegacy(username, temp1, temp2))
+                                {
+                                        // has username typed, make sure we're just using that
+                                        sInstance->childSetText("first_name_edit", LLStringUtil::null);
+                                        sInstance->childSetText("last_name_edit", LLStringUtil::null);
+                                        sInstance->mCallback(0, sInstance->mCallbackData);
+                                }
+                                else
+                                {
+                                        LLNotifications::instance().add("InvalidLogInSecondLife", LLSD(), LLSD(),
+                                                                                        LLPanelLogin::newAccountAlertCallback);
+                                }
+                        }
+                        else
+                        {
+                                LLNotifications::instance().add("MustHaveAccountToLogIn", LLSD(), LLSD(),
+                                                                                        LLPanelLogin::newAccountAlertCallback);
+                        }
                }
                else
                {
-                        LLNotifications::instance().add("MustHaveAccountToLogIn", LLSD(), LLSD(),
+                        std::string first = sInstance->childGetText("first_name_edit");
-                                                                                LLPanelLogin::newAccountAlertCallback);
+                        std::string last  = sInstance->childGetText("last_name_edit");
+                        if (!first.empty() && !last.empty())
+                        {
+                                // has both first and last name typed
+                                sInstance->mCallback(0, sInstance->mCallbackData);
+                        }
+                        else
+                        {
+                                LLNotifications::instance().add("MustHaveAccountToLogIn", LLSD(), LLSD(),
+                                                                                        LLPanelLogin::newAccountAlertCallback);
+                        }
                }
        }
 }
@@ -1123,6 +1305,9 @@ void LLPanelLogin::updateGridCombo(std::string grid_nick)
        llinfos << "current grid set to " << grid_nick << llendl;
+        // switch between username/first+last name based on grid
+        loadLoginForm();
        // grid changed so show new splash screen (possibly)
        loadLoginPage();
diff --git a/linden/indra/newview/llpanellogin.h b/linden/indra/newview/llpanellogin.h
index 5830b52..947aea6 100644
--- a/linden/indra/newview/llpanellogin.h
+++ b/linden/indra/newview/llpanellogin.h
@@ -59,9 +59,9 @@ public:
                void (*callback)(S32 option, void* user_data), 
                void* callback_data);
-        // Remember password checkbox is set via gSavedSettings "RememberPassword"
+        // Sets the login screen's name and password editors. Remember password checkbox is set via gSavedSettings "RememberPassword"
-        static void setFields(const std::string& firstname, const std::string& lastname, 
+        static void setFields(const std::string& firstname, const std::string& lastname, const std::string& password);
-                const std::string& password);
+        static void setFields(const std::string& username, const std::string& password);
        static void addServer(const std::string& server);
        static void refreshLocation( bool force_visible );
@@ -78,6 +78,7 @@ public:
        void setSiteIsAlive( bool alive );
+        static void loadLoginForm();
        static void loadLoginPage();    
        static void refreshLoginPage();
        static void giveFocus();
@@ -101,8 +102,19 @@ private:
        static void onPassKey(LLLineEditor* caller, void* user_data);
        static void onSelectServer(LLUICtrl*, void*);
        static void onServerComboLostFocus(LLFocusableElement*, void*);
+        // converts the following login name formats into valid firstname lastname combos:
+        // username
+        // username.Resident
+        // first.last
+        // first+" "+last
+        // "     "+first+"    "+last+"     "
+        // returns true if name conversion successful
+        static bool convertUsernameToLegacy(std::string& username, std::string& firstname, std::string& lastname);
+        // set the password for the login screen
+        static void setPassword(const std::string& password);
        
-private:
        LLPointer<LLUIImage> mLogoImage;
        void                    (*mCallback)(S32 option, void *userdata);
diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index 99bc4fd..89dc0b2 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -58,7 +58,6 @@ LLPrefsAdvanced::LLPrefsAdvanced()
        childSetCommitCallback("speed_rez_check", onCommitCheckBox, this);
        childSetCommitCallback("command_line_check", onCommitCheckBox, this);
-        childSetAction("reset_btn", onClickResetPrefs, this);
        childSetAction("command_line_btn", onClickCommandLine, this);
 }
@@ -274,24 +273,6 @@ void LLPrefsAdvanced::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
        self->refresh();
 }
-// static
-void LLPrefsAdvanced::onClickResetPrefs(void* user_data)
-{
-        LLPrefsAdvanced* self = (LLPrefsAdvanced*)user_data;
-        LLNotifications::instance().add("ConfirmResetAllPreferences", LLSD(), LLSD(), boost::bind(callbackReset, _1, _2, self));
-}
-// static
-bool LLPrefsAdvanced::callbackReset(const LLSD& notification, const LLSD& response, LLPrefsAdvanced *self)
-{
-        S32 option = LLNotification::getSelectedOption(notification, response);
-        if ( option == 0 )
-        {
-                gSavedSettings.setBOOL("ResetAllPreferences", TRUE);
-        }
-        return false;
-}
 void LLPrefsAdvanced::onSpellAdd(void* data)
 {
        LLPrefsAdvanced* panel = (LLPrefsAdvanced*)data;
diff --git a/linden/indra/newview/llprefsadvanced.h b/linden/indra/newview/llprefsadvanced.h
index 84a7854..d76e602 100644
--- a/linden/indra/newview/llprefsadvanced.h
+++ b/linden/indra/newview/llprefsadvanced.h
@@ -50,11 +50,8 @@ private:
        static LLPrefsAdvanced* sInstance;
        static void onCommitCheckBox(LLUICtrl* ctrl, void* user_data);
-        static void onClickResetPrefs(void* user_data);
        static void onClickCommandLine(void* data);
-        static bool     callbackReset(const LLSD& notification, const LLSD& response, LLPrefsAdvanced *self);
        static void onSpellAdd(void* data);
        static void onSpellRemove(void* data);
        static void onSpellGetMore(void* data);
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index bcac095..ec45955 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -813,8 +813,23 @@ bool idle_startup()
                        // Show the login dialog
                        login_show();
                        // connect dialog is already shown, so fill in the names
-                        LLPanelLogin::setFields( firstname, lastname, password);
+                        // icky how usernames get bolted on here as a kind of hack -- MC
+                        if (gHippoGridManager && gHippoGridManager->getCurrentGrid()->isUsernameCompat())
+                        {
+                                if (lastname == "resident" || lastname == "Resident")
+                                {
+                                        LLPanelLogin::setFields(firstname, password);
+                                }
+                                else
+                                {
+                                        LLPanelLogin::setFields(firstname+"."+lastname, password);
+                                }
+                        }
+                        else
+                        {
+                                LLPanelLogin::setFields(firstname, lastname, password);
+                        }
+                        
                        LLPanelLogin::giveFocus();
                        gSavedSettings.setBOOL("FirstRunThisInstall", FALSE);
diff --git a/linden/indra/newview/lltexturectrl.cpp b/linden/indra/newview/lltexturectrl.cpp
index 38849f9..ccc3ab2 100644
--- a/linden/indra/newview/lltexturectrl.cpp
+++ b/linden/indra/newview/lltexturectrl.cpp
@@ -1514,7 +1514,7 @@ void LLTextureCtrl::draw()
                 (mTexturep->getDiscardLevel() != 1) &&
                 (mTexturep->getDiscardLevel() != 0))
        {
-                LLFontGL* font = LLFontGL::getFontSansSerifBig();
+                LLFontGL* font = LLFontGL::getFontSansSerifLarge();
                font->renderUTF8(
                        mLoadingPlaceholderString, 0,
                        llfloor(interior.mLeft+10), 
diff --git a/linden/indra/newview/llviewerparcelmedia.cpp b/linden/indra/newview/llviewerparcelmedia.cpp
index a5d97f2..386a86e 100644
--- a/linden/indra/newview/llviewerparcelmedia.cpp
+++ b/linden/indra/newview/llviewerparcelmedia.cpp
@@ -49,6 +49,7 @@
 #include "llpluginclassmedia.h"
 #include "llnotify.h"
 #include "llsdserialize.h"
+#include "llmemory.h"
 #include "lloverlaybar.h"
 #include "slfloatermediafilter.h"
@@ -64,6 +65,7 @@ LLSD LLViewerParcelMedia::sMediaFilterList;
 std::set<std::string> LLViewerParcelMedia::sMediaQueries;
 std::set<std::string> LLViewerParcelMedia::sAllowedMedia;
 std::set<std::string> LLViewerParcelMedia::sDeniedMedia;
+LLPointer<LLViewerParcelMediaInfo> LLViewerParcelMedia::sSavedMediaInfo;
 // Local functions
 bool callback_play_media(const LLSD& notification, const LLSD& response, LLParcel* parcel);
@@ -186,7 +188,7 @@ void LLViewerParcelMedia::update(LLParcel* parcel)
 }
 // static
-void LLViewerParcelMedia::play(LLParcel* parcel, bool filter)
+void LLViewerParcelMedia::play(LLParcel* parcel, bool filter, const ECommandOrigin origin)
 {
        lldebugs << "LLViewerParcelMedia::play" << llendl;
@@ -198,12 +200,13 @@ void LLViewerParcelMedia::play(LLParcel* parcel, bool filter)
        std::string media_url = parcel->getMediaURL();
        LLStringUtil::trim(media_url);
-        if (!media_url.empty() && gSavedSettings.getBOOL("MediaEnableFilter") && (filter || !allowedMedia(media_url)))
+        if (!media_url.empty() && gSavedSettings.getBOOL("MediaEnableFilter") && filter
+                && (!allowedMedia(media_url) || origin == COMMAND_ORIGIN_REMOTE))
        {
                // If filtering is needed or in case media_url just changed
                // to something we did not yet approve.
                LLViewerParcelMediaAutoPlay::playStarted();
-                filterMedia(parcel, 0);
+                filterMedia(parcel, 0, origin);
                return;
        }
@@ -384,7 +387,7 @@ void LLViewerParcelMedia::processParcelMediaCommandMessage( LLMessageSystem *msg
                        else
                        {
                                LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
-                                play(parcel);
+                                play(parcel, true, COMMAND_ORIGIN_REMOTE);
                        }
                }
                else
@@ -400,7 +403,7 @@ void LLViewerParcelMedia::processParcelMediaCommandMessage( LLMessageSystem *msg
                if(sMediaImpl.isNull())
                {
                        LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
-                        play(parcel);
+                        play(parcel, true, COMMAND_ORIGIN_REMOTE);
                }
                seek(time);
        }
@@ -437,33 +440,38 @@ void LLViewerParcelMedia::processParcelMediaUpdate( LLMessageSystem *msg, void *
        }
        LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
-        BOOL same = FALSE;
        if (parcel)
        {
-                same = ((parcel->getMediaURL() == media_url) &&
+                LLViewerParcelMediaInfo* new_info = new LLViewerParcelMediaInfo(media_url, media_type, media_id, media_width, media_height, media_auto_scale, media_loop);
-                                (parcel->getMediaType() == media_type) &&
+                LLViewerParcelMediaInfo* current_info = new LLViewerParcelMediaInfo(parcel);
-                                (parcel->getMediaID() == media_id) &&
+                if (new_info != current_info)
-                                (parcel->getMediaWidth() == media_width) &&
-                                (parcel->getMediaHeight() == media_height) &&
-                                (parcel->getMediaAutoScale() == media_auto_scale) &&
-                                (parcel->getMediaLoop() == media_loop));
-                if (!same)
                {
+                        if (!sSavedMediaInfo || (sSavedMediaInfo && !sSavedMediaInfo->sameParcel(parcel)))
+                        {
+                                // only save if no previously saved media info, because
+                                // we want to remeber the original parcel media info.
+                                sSavedMediaInfo = current_info;
+                        }
                        // temporarily store these new values in the parcel
-                        parcel->setMediaURL(media_url);
+                        new_info->applyToParcel(parcel);
-                        parcel->setMediaType(media_type);
-                        parcel->setMediaID(media_id);
-                        parcel->setMediaWidth(media_width);
-                        parcel->setMediaHeight(media_height);
-                        parcel->setMediaAutoScale(media_auto_scale);
-                        parcel->setMediaLoop(media_loop);
-                        play(parcel);
+                        play(parcel, true, COMMAND_ORIGIN_REMOTE);
                }
        }
 }
+//static
+void LLViewerParcelMedia::undoParcelMediaUpdate()
+{
+        LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+        if (sSavedMediaInfo.notNull() && parcel)
+        {
+                sSavedMediaInfo->applyToParcel(parcel);
+        }
+        sSavedMediaInfo = NULL;
+}
 // Static
 /////////////////////////////////////////////////////////////////////////////////////////
 void LLViewerParcelMedia::sendMediaNavigateMessage(const std::string& url)
@@ -619,7 +627,7 @@ void LLViewerParcelMedia::playStreamingMusic(LLParcel* parcel, bool filter)
        {
                // If filtering is needed or in case music_url just changed
                // to something we did not yet approve.
-                filterMedia(parcel, 1);
+                filterMedia(parcel, 1, COMMAND_ORIGIN_LOCAL);
        }
        else if (gAudioStream)
        {
@@ -649,13 +657,18 @@ bool LLViewerParcelMedia::allowedMedia(std::string media_url)
 {
        LLStringUtil::trim(media_url);
        std::string domain = extractDomain(media_url);
+        LLHost host;
+        host.setHostByName(domain);
+        std::string ip = host.getIPString();
        if (sAllowedMedia.count(domain))
        {
                return true;
        }
+        std::string server;
        for (S32 i = 0; i < (S32)sMediaFilterList.size(); i++)
        {
-                if (sMediaFilterList[i]["domain"].asString() == domain)
+                server = sMediaFilterList[i]["domain"].asString();
+                if (server == domain || server == ip)
                {
                        if (sMediaFilterList[i]["action"].asString() == "allow")
                        {
@@ -670,12 +683,13 @@ bool LLViewerParcelMedia::allowedMedia(std::string media_url)
        return false;
 }
-void LLViewerParcelMedia::filterMedia(LLParcel* parcel, U32 type)
+void LLViewerParcelMedia::filterMedia(LLParcel* parcel, U32 type, const ECommandOrigin origin)
 {
        std::string media_action;
        std::string media_url;
        std::string domain;
+        std::string ip;
+        
        if (parcel != LLViewerParcelMgr::getInstance()->getAgentParcel())
        {
                // The parcel just changed (may occur right out after a TP)
@@ -703,31 +717,51 @@ void LLViewerParcelMedia::filterMedia(LLParcel* parcel, U32 type)
                return;
        }
+        LLHost host;
+        host.setHostByName(domain);
+        ip = host.getIPString();
        if (sIsUserAction)
        {
                // This was a user manual request to play this media, so give
                // it another chance...
                sIsUserAction = false;
+                bool dirty = false;
                if (sDeniedMedia.count(domain))
                {
                        sDeniedMedia.erase(domain);
+                        dirty = true;
+                }
+                if (sDeniedMedia.count(ip))
+                {
+                        sDeniedMedia.erase(ip);
+                        dirty = true;
+                }
+                if (dirty)
+                {
                        SLFloaterMediaFilter::setDirty();
                }
        }
-        if (!sMediaFilterListLoaded || sDeniedMedia.count(domain))
+        if (media_url.empty())
+        {
+                media_action == "allow";
+        }
+        else if (!sMediaFilterListLoaded || sDeniedMedia.count(domain) || sDeniedMedia.count(ip))
        {
                media_action = "ignore";
        }
-        else if (sAllowedMedia.count(domain))
+        else if (sAllowedMedia.count(domain) || sAllowedMedia.count(ip))
        {
                media_action = "allow";
        }
        else
        {
+                std::string server;
                for (S32 i = 0; i < (S32)sMediaFilterList.size(); i++)
                {
-                        if (sMediaFilterList[i]["domain"].asString() == domain)
+                        server = sMediaFilterList[i]["domain"].asString();
+                        if (server == domain || server == ip)
                        {
                                media_action = sMediaFilterList[i]["action"].asString();
                                break;
@@ -735,7 +769,7 @@ void LLViewerParcelMedia::filterMedia(LLParcel* parcel, U32 type)
                }
        }
-        if (media_action == "allow" || media_url.empty())
+        if (media_action == "allow")
        {
                if (type == 0)
                {
@@ -745,47 +779,76 @@ void LLViewerParcelMedia::filterMedia(LLParcel* parcel, U32 type)
                {
                        playStreamingMusic(parcel, false);
                }
+                return;
        }
-        else if (media_action == "deny")
+        if (media_action == "ignore")
        {
-                LLSD args;
+                if (type == 0)
-                args["DOMAIN"] = domain;
+                {
-                LLNotifications::instance().add("MediaBlocked", args);
+                        undoParcelMediaUpdate();
-                if (type == 1)
+                }
+                else if (type == 1)
                {
                        LLViewerParcelMedia::stopStreamingMusic();
                }
-                // So to avoid other "blocked" messages later in the session
+                return;
-                // for this url should it be requested again by a script.
-                sDeniedMedia.insert(domain);
        }
-        else if (media_action == "ignore")
+        // skip local-originating play commands, unless the url is blacklisted.
+        if (gSavedSettings.getBOOL("MediaFilterOnlyRemoteCommands")
+                && (origin != COMMAND_ORIGIN_REMOTE)
+                && (media_action != "ignore"))
        {
-                if (type == 1)
+                sAllowedMedia.insert(domain);
+                SLFloaterMediaFilter::setDirty();
+                if (type == 0)
                {
-                        LLViewerParcelMedia::stopStreamingMusic();
+                        play(parcel, false);
                }
+                else
+                {
+                        playStreamingMusic(parcel, false);
+                }
+                return;
+        }
+        LLSD args;
+        if (ip != domain && domain.find('/') == std::string::npos)
+        {
+                args["DOMAIN"] = domain + " (" + ip + ")";
        }
        else
        {
-                sMediaQueries.insert(domain);
-                LLSD args;
                args["DOMAIN"] = domain;
-                if (media_url.find('?') != std::string::npos)
+        }
+        if (media_action == "deny")
+        {
+                LLNotifications::instance().add("MediaBlocked", args);
+                if (type == 0)
                {
-                        args["WARNING"] = " (WARNING: this URL also contains parameter(s) that could potentially be used to correlate your avatar name with your IP)";
+                        undoParcelMediaUpdate();
                }
-                else
+                if (type == 1)
                {
-                        args["WARNING"] = "";
+                        LLViewerParcelMedia::stopStreamingMusic();
                }
+                // So to avoid other "blocked" messages later in the session
+                // for this url should it be requested again by a script.
+                // We don't add the IP, on purpose (want to show different
+                // blocks for different domains pointing to the same IP).
+                sDeniedMedia.insert(domain);
+        }
+        else
+        {
+                sMediaQueries.insert(domain);
+                args["URL"] = media_url;
                if (type == 0)
                {
-                        args["TYPE"] = "a media";
+                        args["TYPE"] = "media";
                }
                else
                {
-                        args["TYPE"] = "an audio";
+                        args["TYPE"] = "audio";
                }
                LLNotifications::instance().add("MediaAlert", args, LLSD(), boost::bind(callback_media_alert, _1, _2, parcel, type, domain));
        }
@@ -795,8 +858,19 @@ void callback_media_alert(const LLSD &notification, const LLSD &response, LLParc
 {
        S32 option = LLNotification::getSelectedOption(notification, response);
+        LLHost host;
+        host.setHostByName(domain);
+        std::string ip = host.getIPString();
        LLSD args;
-        args["DOMAIN"] = domain;
+        if (ip != domain && domain.find('/') == std::string::npos)
+        {
+                args["DOMAIN"] = domain + " (" + ip + ")";
+        }
+        else
+        {
+                args["DOMAIN"] = domain;
+        }
        if (option == 0 || option == 3) // Allow or Whitelist
        {
@@ -807,6 +881,11 @@ void callback_media_alert(const LLSD &notification, const LLSD &response, LLParc
                        newmedia["domain"] = domain;
                        newmedia["action"] = "allow";
                        LLViewerParcelMedia::sMediaFilterList.append(newmedia);
+                        if (ip != domain && domain.find('/') == std::string::npos)
+                        {
+                                newmedia["domain"] = ip;
+                                LLViewerParcelMedia::sMediaFilterList.append(newmedia);
+                        }
                        LLViewerParcelMedia::saveDomainFilterList();
                        args["LISTED"] = "whitelisted";
                        LLNotifications::instance().add("MediaListed", args);
@@ -823,10 +902,19 @@ void callback_media_alert(const LLSD &notification, const LLSD &response, LLParc
        else if (option == 1 || option == 2) // Deny or Blacklist
        {
                LLViewerParcelMedia::sDeniedMedia.insert(domain);
-                if (type == 1)
+                if (ip != domain && domain.find('/') == std::string::npos)
+                {
+                        LLViewerParcelMedia::sDeniedMedia.insert(ip);
+                }
+                if (type == 0)
+                {
+                        LLViewerParcelMedia::undoParcelMediaUpdate();
+                }
+                else if (type == 1)
                {
                        LLViewerParcelMedia::stopStreamingMusic();
                }
+                
                if (option == 1) // Deny
                {
                        LLNotifications::instance().add("MediaBlocked", args);
@@ -837,6 +925,11 @@ void callback_media_alert(const LLSD &notification, const LLSD &response, LLParc
                        newmedia["domain"] = domain;
                        newmedia["action"] = "deny";
                        LLViewerParcelMedia::sMediaFilterList.append(newmedia);
+                        if (ip != domain && domain.find('/') == std::string::npos)
+                        {
+                                newmedia["domain"] = ip;
+                                LLViewerParcelMedia::sMediaFilterList.append(newmedia);
+                        }
                        LLViewerParcelMedia::saveDomainFilterList();
                        args["LISTED"] = "blacklisted";
                        LLNotifications::instance().add("MediaListed", args);
@@ -928,7 +1021,12 @@ std::string LLViewerParcelMedia::extractDomain(std::string url)
                url = url.substr(pos + 1, count);
        }
-        if (url.find(gAgent.getRegion()->getHost().getHostName()) == 0 || url.find(last_region) == 0)
+        std::string current_region = gAgent.getRegion()->getHost().getHostName();
+        if (!current_region.size())
+        {
+                current_region = gAgent.getRegion()->getHost().getIPString();
+        }
+        if (url.find(current_region) == 0 || url.find(last_region) == 0)
        {
                // This must be a scripted object rezzed in the region:
                // extend the concept of "domain" to encompass the
@@ -937,7 +1035,7 @@ std::string LLViewerParcelMedia::extractDomain(std::string url)
                // Get rid of any port number
                pos = url.find('/');            // We earlier made sure that there's one
-                url = gAgent.getRegion()->getHost().getHostName() + url.substr(pos);
+                url = current_region + url.substr(pos);
                pos = url.find('?');
                if (pos != std::string::npos)
@@ -972,6 +1070,73 @@ std::string LLViewerParcelMedia::extractDomain(std::string url)
        // Remember this region, so to cope with requests occuring just after a
        // TP out of it.
        last_region = gAgent.getRegion()->getHost().getHostName();
+        if (!last_region.size())
+        {
+                last_region = gAgent.getRegion()->getHost().getIPString();
+        }
        return url;
 }
+LLViewerParcelMediaInfo::LLViewerParcelMediaInfo(const std::string url,
+                                                                                                 const std::string type,
+                                                                                                 const LLUUID media_id,
+                                                                                                 const S32 width,
+                                                                                                 const S32 height,
+                                                                                                 const U8 scale,
+                                                                                                 const U8 loop)
+        :
+        mMediaURL(url),
+        mMediaType(type),
+        mMediaID(media_id),
+        mMediaWidth(width),
+        mMediaHeight(height),
+        mMediaAutoScale(scale),
+        mMediaLoop(loop)
+{
+        LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+        mParcelLocalID = parcel ? parcel->getLocalID() : 0;
+}
+LLViewerParcelMediaInfo::LLViewerParcelMediaInfo(const LLParcel* parcel)
+{
+        mMediaURL = parcel->getMediaURL();
+        mMediaType = parcel->getMediaType();
+        mMediaID = parcel->getMediaID();
+        mMediaWidth = parcel->getMediaWidth();
+        mMediaHeight = parcel->getMediaHeight();
+        mMediaAutoScale = parcel->getMediaAutoScale();
+        mMediaLoop = parcel->getMediaLoop();
+        mParcelLocalID = parcel->getLocalID();
+}
+void LLViewerParcelMediaInfo::applyToParcel(LLParcel* parcel)
+{
+        if (parcel && sameParcel(parcel))
+        {
+                parcel->setMediaURL(mMediaURL);
+                parcel->setMediaType(mMediaType);
+                parcel->setMediaID(mMediaID);
+                parcel->setMediaWidth(mMediaWidth);
+                parcel->setMediaHeight(mMediaHeight);
+                parcel->setMediaAutoScale(mMediaAutoScale);
+                parcel->setMediaLoop(mMediaLoop);
+        }
+}
+bool LLViewerParcelMediaInfo::sameParcel(const LLParcel* parcel) const
+{
+        return parcel && (parcel->getLocalID() == mParcelLocalID);
+}
+bool LLViewerParcelMediaInfo::operator==(const LLViewerParcelMediaInfo &rhs) const
+{
+        return  (mMediaURL == rhs.mMediaURL) &&
+                        (mMediaType == rhs.mMediaType) &&
+                        (mMediaID == rhs.mMediaID) &&
+                        (mMediaWidth == rhs.mMediaWidth) &&
+                        (mMediaHeight == rhs.mMediaHeight) &&
+                        (mMediaAutoScale == rhs.mMediaAutoScale) &&
+                        (mMediaLoop == rhs.mMediaLoop) &&
+                        (mParcelLocalID == rhs.mParcelLocalID);
+}
+\ No newline at end of file
diff --git a/linden/indra/newview/llviewerparcelmedia.h b/linden/indra/newview/llviewerparcelmedia.h
index 7531a0f..f4c4312 100644
--- a/linden/indra/newview/llviewerparcelmedia.h
+++ b/linden/indra/newview/llviewerparcelmedia.h
@@ -34,6 +34,7 @@
 #define LLVIEWERPARCELMEDIA_H
 #include "llviewermedia.h"
+#include "llmemory.h"
 // For use by other patches so they know that media filtering is implemented.
 #define MEDIA_FILTERING 1
@@ -41,6 +42,7 @@
 class LLMessageSystem;
 class LLParcel;
 class LLViewerParcelMediaNavigationObserver;
+class LLViewerParcelMediaInfo;
 // This class understands land parcels, network traffic, LSL media
@@ -49,6 +51,13 @@ class LLViewerParcelMediaNavigationObserver;
 class LLViewerParcelMedia : public LLViewerMediaObserver
 {
        LOG_CLASS(LLViewerParcelMedia);
+        private:
+                typedef enum e_command_origin
+                {
+                        COMMAND_ORIGIN_LOCAL,
+                        COMMAND_ORIGIN_REMOTE
+                } ECommandOrigin;
        public:
                static void initClass();
                static void cleanupClass();
@@ -57,14 +66,14 @@ class LLViewerParcelMedia : public LLViewerMediaObserver
                        // called when the agent's parcel has a new URL, or the agent has
                        // walked on to a new parcel with media
-                static void play(LLParcel* parcel, bool filter = true);
+                static void play(LLParcel* parcel, bool filter = true, const ECommandOrigin origin = COMMAND_ORIGIN_LOCAL);
                        // user clicked play button in media transport controls
                static void playStreamingMusic(LLParcel* parcel, bool filter = true);
                        // play the parcel music stream
                static void stopStreamingMusic();
                        // stop the parcel music stream
-                static void filterMedia(LLParcel* parcel, U32 type); // type: 0 = media, 1 = streaming music
+                static void filterMedia(LLParcel* parcel, U32 type, const ECommandOrigin origin); // type: 0 = media, 1 = streaming music
                static bool allowedMedia(std::string media_url);
                static bool loadDomainFilterList();
@@ -90,6 +99,7 @@ class LLViewerParcelMedia : public LLViewerMediaObserver
                static void processParcelMediaCommandMessage( LLMessageSystem *msg, void ** );
                static void processParcelMediaUpdate( LLMessageSystem *msg, void ** );
+                static void undoParcelMediaUpdate(); // reset the parcel's media to what it was before ParcelMediaUpdate
                static void sendMediaNavigateMessage(const std::string& url);
                
                // inherited from LLViewerMediaObserver
@@ -107,6 +117,7 @@ class LLViewerParcelMedia : public LLViewerMediaObserver
                static std::set<std::string> sMediaQueries;
                static std::set<std::string> sAllowedMedia;
                static std::set<std::string> sDeniedMedia;
+                static LLPointer<LLViewerParcelMediaInfo> sSavedMediaInfo; // The parcel original media (before a remote command is applied)
 };
@@ -120,4 +131,29 @@ public:
 };
+class LLViewerParcelMediaInfo : public LLRefCount
+{
+public:
+        LLViewerParcelMediaInfo(const std::string url, 
+                                                        const std::string type,
+                                                        const LLUUID media_id,
+                                                        const S32 width,
+                                                        const S32 height,
+                                                        const U8 scale,
+                                                        const U8 loop);
+        LLViewerParcelMediaInfo(const LLParcel* parcel);
+        ~LLViewerParcelMediaInfo() {}
+        void applyToParcel(LLParcel* parcel);
+        bool sameParcel(const LLParcel* parcel) const;
+        bool operator==(const LLViewerParcelMediaInfo &rhs) const;
+private:
+        std::string                     mMediaURL;
+        std::string             mMediaType;
+        LLUUID                          mMediaID;
+        S32                                     mMediaWidth;
+        S32                                     mMediaHeight;
+        U8                                      mMediaAutoScale;
+        U8                  mMediaLoop;
+        S32                                     mParcelLocalID;
+};
 #endif
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 57580cf..c4d5e58 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -1278,6 +1278,13 @@ LLViewerWindow::LLViewerWindow(
        LLAppViewer::instance()->forceExit(1);
        }
        
+        const U32 real_fsaa = mWindow->getFSAASamples();
+        if (real_fsaa != gSavedSettings.getU32("RenderFSAASamples"))
+        {
+                LL_WARNS("Window") << "Window created with reduced anti-aliasing samples: " << real_fsaa << "x FSAA." << LL_ENDL;
+                gSavedSettings.setU32("RenderFSAASamples", real_fsaa);
+        }
        // Get the real window rect the window was created with (since there are various OS-dependent reasons why
        // the size of a window or fullscreen context may have been adjusted slightly...)
        F32 ui_scale_factor = gSavedSettings.getF32("UIScaleFactor");
@@ -2178,7 +2185,7 @@ void LLViewerWindow::draw()
                {
                        // Used for special titles such as "Second Life - Special E3 2003 Beta"
                        const S32 DIST_FROM_TOP = 20;
-                        LLFontGL::getFontSansSerifBig()->renderUTF8(
+                        LLFontGL::getFontSansSerifLarge()->renderUTF8(
                                mOverlayTitle, 0,
                                llround( getWindowWidth() * 0.5f),
                                getWindowHeight() - DIST_FROM_TOP,
diff --git a/linden/indra/newview/llworldmap.cpp b/linden/indra/newview/llworldmap.cpp
index bd3996d..608d720 100644
--- a/linden/indra/newview/llworldmap.cpp
+++ b/linden/indra/newview/llworldmap.cpp
@@ -81,7 +81,9 @@ LLSimInfo::LLSimInfo()
        mAccess(0x0),
        mRegionFlags(0x0),
        mWaterHeight(0.f),
-        mAlpha(-1.f)
+        mAlpha(-1.f),
+        msizeX(REGION_WIDTH_UNITS),
+        msizeY(REGION_WIDTH_UNITS)
 {
 }
diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp
index 8d9ed1b..d7a6838 100644
--- a/linden/indra/newview/llworldmapview.cpp
+++ b/linden/indra/newview/llworldmapview.cpp
@@ -472,7 +472,7 @@ void LLWorldMapView::draw()
                F32 bottom =    sPanY + half_height + relative_y;
                F32 left =              sPanX + half_width + relative_x;
                F32 top =               bottom+ (sMapScale * info->msizeY / REGION_WIDTH_METERS);
-                F32 right =             left + (sMapScale * info->msizeY / REGION_WIDTH_METERS);
+                F32 right =             left + (sMapScale * info->msizeX / REGION_WIDTH_METERS);
                // Switch to world map texture (if available for this region) if either:
                // 1. Tiles are zoomed out small enough, or
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
index c8aacba..453bf46 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
@@ -915,32 +915,18 @@ Only large parcels can be listed in search.
                                 right="-12"
                                 scale_image="true"
                                 width="70" />
-                        <check_box
-                                 bottom_delta="-22"
-                                 enabled="true"
-                                 follows="left|top"
-                                 font="SansSerifSmall"
-                                 height="16"
-                                 initial_value="false"
-                                 label="Hide URL"
-                                 left="80"
-                                 mouse_opaque="true"
-                                 name="hide_media_url"
-                                 radio_style="false"
-                                 tool_tip="Checking this option will hide the media URL from any non-authorized viewers of this parcel information. Note this is not available for HTML types."
-                                 width="150" />
                        <text
-                                 bottom_delta="0"
+                                 bottom_delta="-22"
                                 follows="right|top"
                                 font="SansSerifSmall"
-                                 halign="right"
+                                 halign="left"
                                 height="16"
                                 length="1"
                                 name="media_reset"
-                                 right="-164"
+                                 left="80"
                                 tool_tip="Amount of time until parcel automatically reverts to default URL (0 for never return)"
                                 type="string"
-                                 width="185">
+                                 width="120">
                                Return to Home URL in:
                        </text>
                        <spinner
@@ -948,14 +934,13 @@ Only large parcels can be listed in search.
                                 decimal_digits="0"
                                 enabled="false"
                                 follows="right|top"
-                                 halign="right"
                                 height="16"
                                 increment="1"
                                 initial_val="0"
                                 max_val="1024"
                                 min_val="0"
                                 name="media_reset_time"
-                                 right="-90"
+                                 left_delta="126"
                                 tool_tip="Amount of time until parcel reverts to default URL (0 for never return)"
                                 width="64" />
                        <text
@@ -964,12 +949,11 @@ Only large parcels can be listed in search.
                                 font="SansSerifSmall"
                                 halign="left"
                                 height="16"
-                                 left_delta="70"
+                                 left_delta="72"
                                 length="1"
                                 name="minutes"
-                                 right="-10"
                                 type="string">
-                                Minutes
+                                minutes
                        </text>
                        <text
                                 bottom_delta="-22"
@@ -1315,20 +1299,6 @@ Select the thumbnail to choose a different texture.
                                 name="music_url"
                                 right="-15"
                                 select_on_focus="true" />
-                        <check_box
-                                 bottom_delta="-25"
-                                 enabled="true"
-                                 follows="left|top"
-                                 font="SansSerifSmall"
-                                 height="16"
-                                 initial_value="false"
-                                 label="Hide URL"
-                                 left="80"
-                                 mouse_opaque="true"
-                                 name="hide_music_url"
-                                 radio_style="false"
-                                 tool_tip="Checking this option will hide the music URL from any non-authorized viewers of this parcel information."
-                                 width="150" />
                        <text
                                 bottom_delta="-65"
                                 follows="left|top"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml
index 3370ea8..47638d5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml
@@ -117,7 +117,7 @@ sold with objects
        <icon follows="top|left" height="64" image_name="badge_ok.j2c" left="0" name="step_1"
             width="64" />
        <text bottom_delta="38" follows="top|left" height="16" left="72"
-             name="account_action" right="438" width="218" font="SansSerifBig" >
+             name="account_action" right="438" width="218" font="SansSerifLarge" >
                Upgrade you to premium membership.
        </text>
        <text follows="top|left" height="16" left="72" name="account_reason" right="400"
@@ -139,7 +139,7 @@ sold with objects
        <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0"
             name="step_2" width="64" />
        <text bottom_delta="38" follows="top|left" height="16" left="72"
-             name="land_use_action" right="438" width="218" font="SansSerifBig" >
+             name="land_use_action" right="438" width="218" font="SansSerifLarge" >
                Increase your monthly land use fees to US$ 40/month.
        </text>
        <text follows="top|left" height="32" left="72" name="land_use_reason" right="435"
@@ -151,7 +151,7 @@ This parcel is 512 sq.m. of land.
        <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0"
             name="step_3" width="64" />
        <text bottom_delta="38" follows="top|left" height="16" left="72"
-             name="purchase_action" right="438" font="SansSerifBig" >
+             name="purchase_action" right="438" font="SansSerifLarge" >
                Pay Joe Resident L$ 4000 for the land
        </text>
        <text follows="top|left" height="16" left="72" name="currency_reason" right="400">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_media_filter.xml b/linden/indra/newview/skins/default/xui/en-us/floater_media_filter.xml
index 9b7355c..f0fb3a3 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_media_filter.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_media_filter.xml
@@ -1,9 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floatermediafilter" title="Media Filter" rect_control="MediaFilterRect"
 can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
- height="350" width="600" min_height="350" min_width="600">
+ height="410" width="600" min_height="350" min_width="600">
+        <check_box control_name="MediaEnableFilter" name="enable_mediafilter" label="Enable Media Filter"
+         initial_value="true" tool_tip="Enables filtering media URLs by domain names."
+         font="SansSerifSmall" mouse_opaque="true"
+         left="14" height="16" bottom_delta="-45" width="4500" follows="left|top" />
+        <check_box control_name="MediaFilterOnlyRemoteCommands" name="filter_only_remote"
+         label="Filter only when a script initiates the stream (less secure)" initial_value="false" 
+         tool_tip="This will prevent popups asking about URLs that are permanently set on a parcel. 
+Only scripted changes to the media URL and scripted requests to start playing a stream will be filtered."
+         font="SansSerifSmall" mouse_opaque="true"
+         left_delta="14" height="16" width="450" follows="left|top" />
        <text name="info1" font="SansSerif" mouse_opaque="true" halign="center"
-         bottom_delta="-45" left="20" height="20" width="560" follows="left|right|top">
+         bottom_delta="-40" left="20" height="20" width="560" follows="left|right|top">
                Domains in bold are in the persistent list (i.e. they are whitelisted or blacklisted).
        </text>
        <text name="info2" font="SansSerif" mouse_opaque="true" halign="center"
@@ -14,48 +27,68 @@
        <scroll_list name="whitelist_list" follows="top|bottom|left"
         background_visible="true" mouse_opaque="true"
         multi_select="false" column_padding="5" draw_border="true" draw_heading="true"
-         bottom_delta="-205" left="15" height="200" width="280">
+         bottom_delta="-200" left="15" height="200" width="280">
-                <column name="whitelist_col" label="Allowed domains/objects" dynamicwidth="true" />
+                <column name="whitelist_col" label="Allowed domains or server objects" dynamicwidth="true" />
        </scroll_list>
        <scroll_list name="blacklist_list" follows="top|bottom|right"
         background_visible="true" mouse_opaque="true"
         multi_select="false" column_padding="5" draw_border="true" draw_heading="true"
         bottom_delta="0" right="-15" height="200" width="280">
-                <column name="blacklist_col" label="Blocked domains/objects" dynamicwidth="true" />
+                <column name="blacklist_col" label="Blocked domains or server objects" dynamicwidth="true" />
        </scroll_list>
        <button name="add_whitelist" font="SansSerif" label="Add..." halign="center"
+         tool_tip="Add a server to the whitelist"
         enabled="true" mouse_opaque="true" follows="bottom|left"
-         bottom_delta="-25" left="30" height="20" width="80" />
+         bottom_delta="-25" left="15" height="20" width="80" />
        <button name="remove_whitelist" font="SansSerif" label="Remove" halign="center"
+         tool_tip="Remove the selected server from the whitelist"
         enabled="true" mouse_opaque="true" follows="bottom|left"
-         bottom_delta="0" left_delta="100" height="20" width="80" />
+         bottom_delta="0" left="100" height="20" width="80" />
        <button name="clear_lists" font="SansSerif" label="Clear lists" halign="center"
-         enabled="true" mouse_opaque="true" follows="bottom|left|right"
+         tool_tip="Clear all lists"
-         bottom_delta="0" left_delta="110" height="20" width="120" />
+         enabled="true" mouse_opaque="true" follows="bottom|left"
+         bottom_delta="0" left="205" height="20" width="90" />
+        <button name="show_ips" font="SansSerif" label="Show IPs" halign="center"
+         tool_tip="Show the IP associated with each domain name (makes the viewer pause while the list is refreshed, because of DNS lookups)"
+         enabled="true" mouse_opaque="true" follows="bottom|right"
+         bottom_delta="0" right="-205" height="20" width="90" />
        <button name="add_blacklist" font="SansSerif" label="Add..." halign="center"
+         tool_tip="Add a server to the blacklist"
         enabled="true" mouse_opaque="true" follows="bottom|right"
-         bottom_delta="0" right="-130" height="20" width="80" />
+         bottom_delta="0" right="-100" height="20" width="80" />
        <button name="remove_blacklist" font="SansSerif" label="Remove" halign="center"
+         tool_tip="Remove the selected server from the blacklist"
         enabled="true" mouse_opaque="true" follows="bottom|right"
-         bottom_delta="0" right="-30" height="20" width="80" />
+         bottom_delta="0" right="-15" height="20" width="80" />
-        <text name="add_text" font="SansSerif" mouse_opaque="true" enabled="true"
+        <text name="add_text" font="SansSerif" mouse_opaque="true"
-         bottom_delta="-25" left="20" height="20" width="500" follows="left|right|bottom">
+         bottom_delta="-25" left="20" height="20" width="450" follows="left|right|bottom">
                New domain:
        </text>
+        <check_box name="match_ip" label="Add/remove matching IP" initial_value="true"
+         tool_tip="Add or remove any IP associated with the added or removed domain name"
+         font="SansSerifSmall" mouse_opaque="true" radio_style="false"
+         bottom_delta="2" right="-95" height="16" width="70" follows="right|bottom" />
        <line_editor name="input_domain" max_length="255" font="SansSerif" enabled="false"
+         tool_tip="Enter the new URL, domain name, IP or scripted object HTTP server path here"
         select_all_on_focus_received="true" select_on_focus="true"
         bevel_style="in" border_style="line" border_thickness="1"
-         bottom_delta="-20"     right="-100" height="20" left="15" follows="left|bottom|right"/>
+         bottom_delta="-22"     right="-180" height="20" left="15" follows="left|bottom|right"/>
-        <button name="commit_domain" font="SansSerif" label="Add" halign="center" enabled="false"
+        <button name="cancel_domain" font="SansSerif" label="Cancel" halign="center" enabled="false"
         mouse_opaque="true" follows="bottom|right"
         bottom_delta="0" right="-15" height="20" width="80"/>
+        <button name="commit_domain" font="SansSerif" label="Add" halign="center" enabled="false"
+         tool_tip="Add to the list"
+         mouse_opaque="true" follows="bottom|right"
+         bottom_delta="0" right="-95" height="20" width="80"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_preferences.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preferences.xml
index 939a877..213147a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_preferences.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preferences.xml
@@ -18,8 +18,11 @@
             halign="center" height="20"
             help_url="http://support.imprudenceviewer.org/"
             label="Support" left="9" mouse_opaque="true"
-             name="Support" scale_image="true" width="100" />
+             name="Support" scale_image="true" width="90" />
-        <tab_container bottom="-476" enabled="true" follows="left|top|right|bottom" height="455"
+  <button bottom_delta="0" follows="left|bottom" font="SansSerif" height="20" width="160"
+       label="Reset All To Default" name="reset_btn" left_delta="95"
+       tool_tip="Reset all preferences to their default values (requires a restart)" />
+  <tab_container bottom="-476" enabled="true" follows="left|top|right|bottom" height="455"
             left="0" mouse_opaque="false" name="pref core" tab_group="1"
             tab_position="left" tab_width="120" width="620" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_sell_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_sell_land.xml
index d91b5ff..3aeba26 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_sell_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_sell_land.xml
@@ -27,7 +27,7 @@
        <icon bottom_delta="-66" follows="top|left" height="64" image_name="badge_note.j2c"
             left="0" name="step_price" width="64" />
        <text bottom_delta="38" follows="top|left" height="16" left="72" name="price_label"
-             right="-20" font="SansSerifBig" >
+             right="-20" font="SansSerifLarge" >
                Set a price:
        </text>
        <text follows="top|left" height="16" left="72" name="price_text" right="-20">
@@ -44,7 +44,7 @@
        <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0"
             name="step_sell_to" width="64" />
        <text bottom_delta="38" follows="top|left" height="16" left="72" name="sell_to_label"
-             right="-20" font="SansSerifBig" >
+             right="-20" font="SansSerifLarge" >
                Sell the land to:
        </text>
        <text follows="top|left" height="16" left="72" name="sell_to_text" right="-20">
@@ -69,7 +69,7 @@
        <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0"
             name="step_sell_objects" width="64" />
        <text bottom_delta="38" follows="top|left" height="16" left="72"
-             name="sell_objects_label" right="-20" font="SansSerifBig" >
+             name="sell_objects_label" right="-20" font="SansSerifLarge" >
                Sell the objects with the land?
        </text>
        <text bottom_delta="-20" follows="top|left" height="16" left="72"
@@ -89,7 +89,7 @@
        <button bottom_delta="4" height="16" label="Show Objects" name="show_objects"
             right="414" width="110" />
        <text bottom_delta="-35" follows="top|left" height="16" left="72"
-             name="nag_message_label" right="-20" font="SansSerifBig" >
+             name="nag_message_label" right="-20" font="SansSerifLarge" >
                REMEMBER: All sales are final.
        </text>
        <button bottom="-479" follows="bottom|left" height="20" label="Set Land For Sale"
diff --git a/linden/indra/newview/skins/default/xui/en-us/fonts.xml b/linden/indra/newview/skins/default/xui/en-us/fonts.xml
index 7343ac2..e9ede83 100644
--- a/linden/indra/newview/skins/default/xui/en-us/fonts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/fonts.xml
@@ -147,6 +147,10 @@
             comment="Size of large font (points, or 1/72 of an inch)"
             size="12"
             />
+  <font_size name="Bigger"
+             comment="Size of medium font (points, or 1/72 of an inch)"
+             size="11"
+             />
  <font_size name="Medium"
             comment="Size of medium font (points, or 1/72 of an inch)"
             size="10"
diff --git a/linden/indra/newview/skins/default/xui/en-us/mime_types_linux.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types_linux.xml
index e95b371..f0ba830 100755
--- a/linden/indra/newview/skins/default/xui/en-us/mime_types_linux.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/mime_types_linux.xml
@@ -431,6 +431,17 @@
                        media_plugin_gstreamer
                </impl>
        </mimetype>
+        <mimetype name="video/x-m4v">
+                <label name="video/m4v_label">
+                        Movie (M4V)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+                        media_plugin_gstreamer
+                </impl>
+        </mimetype>
        <mimetype menu="1" name="video/quicktime">
                <label name="video/quicktime_label">
                        Movie (QuickTime)
diff --git a/linden/indra/newview/skins/default/xui/en-us/mime_types_mac.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types_mac.xml
index 7931e55..e1751eb 100755
--- a/linden/indra/newview/skins/default/xui/en-us/mime_types_mac.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/mime_types_mac.xml
@@ -431,6 +431,17 @@
                        media_plugin_quicktime
                </impl>
        </mimetype>
+        <mimetype name="video/x-m4v">
+                <label name="video/m4v_label">
+                        Movie (M4V)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+                        media_plugin_gstreamer
+                </impl>
+        </mimetype>
        <mimetype menu="1" name="video/quicktime">
                <label name="video/quicktime_label">
                        Movie (QuickTime)
diff --git a/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml
index 5ee4ed0..26491e0 100644
--- a/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml
@@ -428,8 +428,19 @@
                        movie
                </widgettype>
                <impl>
-      media_plugin_quicktime
+                        media_plugin_quicktime
-    </impl>
+                </impl>
+        </mimetype>
+        <mimetype name="video/x-m4v">
+                <label name="video/m4v_label">
+                        Movie (M4V)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+                        media_plugin_gstreamer
+                </impl>
        </mimetype>
        <mimetype menu="1" name="video/quicktime">
                <label name="video/quicktime_label">
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 27f5529..306e3b8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -7197,6 +7197,25 @@ IM history could not be found for [NAME].
 </notification>
 <notification
+  icon="alertmodal.tga"
+  name="InvalidLogInSecondLife"
+  type="alertmodal">
+Oops! The login name you entered wasn't formatted correctly!
+[SECOND_LIFE] accepts the following login formats:
+ - username
+ - username.Resident
+ - firstname.lastname
+If you don't have an account, would you like to create one now?
+  <usetemplate
+   name="okcancelbuttons"
+   notext="Try again"
+   yestext="Create an account"/>
+</notification>
+<notification
 icon="alert.tga"
 name="ShowLookAtInfo"
 type="alert">
@@ -7324,11 +7343,15 @@ The Second Life Terms of Service do not allow you to opt out. By logging in to S
   icon="alert.tga"
   name="MediaAlert"
   type="alert">
-The owner of this parcel has requested [TYPE] URL pertaining to the following domain or scripted object to be loaded by your viewer[WARNING]:
+The owner of this parcel has requested the following [TYPE] URL to be loaded by your viewer:
+[URL]
+You may choose to allow or deny the corresponding domain or in-world scripted object server:
 [DOMAIN]
-"Allow" and "Deny" apply only for this session, while "Blacklist" and "Whitelist" apply forever to the above domain or scripted object.
+"Allow" and "Deny" apply only for this session, while "Blacklist" and "Whitelist" apply forever.
   <form name="form">
    <button
         index="0"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml
index 3e69d15..b032b09 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml
@@ -21,7 +21,7 @@ Hover your mouse over the options for more help.
             prevalidate="ascii" v_pad="0" width="300" spell_check="true" />
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-20" drop_shadow_visible="true" follows="left|top"
-             font="SansSerifBig" h_pad="0" halign="left" height="16" left="7"
+             font="SansSerifLarge" h_pad="0" halign="left" height="16" left="7"
             mouse_opaque="true" name="group_name" v_pad="0" width="300">
                Type your new group name here
        </text>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml
index 9341d4b..b5f7b37 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml
@@ -18,7 +18,7 @@
        </string>
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-20" drop_shadow_visible="true" follows="left|top"
-             font="SansSerifBig" h_pad="0" halign="left" height="16" left="7"
+             font="SansSerifLarge" h_pad="0" halign="left" height="16" left="7"
             mouse_opaque="true" name="group_land_heading" v_pad="0" width="150">
                Group Owned Land
        </text>
@@ -105,7 +105,7 @@
        </text>
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom_delta="-25" drop_shadow_visible="true" follows="left|top"
-             font="SansSerifBig" h_pad="0" halign="left" height="16" left="12"
+             font="SansSerifLarge" h_pad="0" halign="left" height="16" left="12"
             mouse_opaque="true" name="group_money_heading" v_pad="0" width="150">
                Group [CURRENCY]
        </text>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_notices.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_notices.xml
index bca87d9..e6d7604 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_notices.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_notices.xml
@@ -15,7 +15,7 @@ the General tab.
        <button bottom="-24" font="SansSerif" halign="center" height="16" label="?"
             label_selected="?" left="391" name="help_button" width="20" />
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-20" drop_shadow_visible="true" font="SansSerifBig" h_pad="0"
+             bottom="-20" drop_shadow_visible="true" font="SansSerifLarge" h_pad="0"
             halign="left" height="16" left="7" mouse_opaque="true" name="lbl" v_pad="0"
             width="436">
                Group Notices Archive
@@ -51,7 +51,7 @@ Notice lists are limited to 200 notices per group on a daily basis.
        <panel border="false" bottom="0" follows="all" height="268" label="Create New Notice"
             left="1" mouse_opaque="true" name="panel_create_new_notice" width="418">
                <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                     bottom="-18" drop_shadow_visible="true" font="SansSerifBig" h_pad="0"
+                     bottom="-18" drop_shadow_visible="true" font="SansSerifLarge" h_pad="0"
                     halign="left" height="16" left="7" mouse_opaque="false" name="lbl"
                     v_pad="0" width="436">
                        Create a Notice
@@ -115,7 +115,7 @@ and you can&apos;t send a folder.
        <panel border="false" bottom="0" follows="all" height="268" label="View Past Notice"
             left="1" mouse_opaque="true" name="panel_view_past_notice" width="418">
                <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                     bottom="-18" drop_shadow_visible="true" font="SansSerifBig" h_pad="0"
+                     bottom="-18" drop_shadow_visible="true" font="SansSerifLarge" h_pad="0"
                     halign="left" height="16" left="7" mouse_opaque="false" name="lbl"
                     v_pad="0" width="436">
                        Archived Notice
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
index e5b621e..014b28d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
@@ -12,7 +12,7 @@
             name="help_button" width="20" />
        <panel border="false" bottom="-24" height="24" left="7" name="members_header"
             visible="true" width="380">
-                <text bottom_delta="-20" font="SansSerifBig" halign="left" height="16" left="0"
+                <text bottom_delta="-20" font="SansSerifLarge" halign="left" height="16" left="0"
                     name="static" width="150">
                        Members &amp; Roles
                </text>
@@ -24,7 +24,7 @@ easily be customized, allowing for greater organization and flexibility.
        </panel>
        <panel border="false" bottom_delta="0" height="24" left="7" name="roles_header"
             visible="false" width="380">
-                <text bottom_delta="-20" font="SansSerifBig" halign="left" height="16" left="0"
+                <text bottom_delta="-20" font="SansSerifLarge" halign="left" height="16" left="0"
                     name="static" width="100">
                        Roles
                </text>
@@ -47,7 +47,7 @@ easily be customized, allowing for greater organization and flexibility.
        </panel>
        <panel border="false" bottom_delta="-20" height="24" left="7" name="actions_header"
             visible="false" width="380">
-                <text bottom_delta="0" font="SansSerifBig" halign="left" height="16" left="0"
+                <text bottom_delta="0" font="SansSerifLarge" halign="left" height="16" left="0"
                     name="static" width="200">
                        Abilities
                </text>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_voting.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_voting.xml
index 168b60b..64be465 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_voting.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_voting.xml
@@ -20,7 +20,7 @@ vote on open proposals, and view old proposals.
             name="help_button" width="20" />
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="446" drop_shadow_visible="true" follows="left|top"
-             font="SansSerifBig" h_pad="0" halign="left" height="16" left="7"
+             font="SansSerifLarge" h_pad="0" halign="left" height="16" left="7"
             mouse_opaque="false" name="proposal_header" v_pad="0" width="363">
                Open Group Proposals
        </text>
@@ -144,7 +144,7 @@ vote on open proposals, and view old proposals.
             mouse_opaque="true" name="btn_abstain" width="63" />
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-240" drop_shadow_visible="true" follows="left|top"
-             font="SansSerifBig" h_pad="0" halign="left" height="10" left="12"
+             font="SansSerifLarge" h_pad="0" halign="left" height="10" left="12"
             mouse_opaque="false" name="txt" v_pad="0" width="363">
                Group Voting History
        </text>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
index 16dd4ad..68991b6 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
@@ -30,32 +30,6 @@
        </string>
-  <!-- START LOCATION -->
-        <text name="start_location_text" 
-              bottom="32" left="10" height="16" right="115"
-        follows="left|bottom" h_pad="0" halign="right" v_pad="0"
-        bg_visible="false" drop_shadow_visible="true"
-        border_visible="false" border_drop_shadow_visible="false"
-              font="SansSerifSmall" mouse_opaque="true">
-                Start location:
-        </text>
-        <combo_box name="start_location_combo"
-             bottom_delta="2" left="120" height="16" width="150"
-             follows="left|bottom" font="SansSerifSmall"
-             mouse_opaque="true" allow_text_entry="true" max_chars="128">
-                <combo_item name="MyHome" value="My Home">
-                        My Home
-                </combo_item>
-                <combo_item name="MyLastLocation" value="My Last Location">
-                        My Last Location
-                </combo_item>
-                <combo_item name="Typeregionname" value="&lt;Type region name&gt;">
-                        &lt;Type region name&gt;
-                </combo_item>
-        </combo_box>
  <!-- FIRST NAME -->
        <text name="first_name_text" 
@@ -96,10 +70,30 @@
               allow_translate="false" />
+  <!-- SL USERNAME -->
+  <text name="username_text"
+              bottom="80" left="24" height="16" width="250"
+        follows="left|bottom" h_pad="0" halign="left" v_pad="0"
+        bg_visible="false" drop_shadow_visible="true"
+        border_visible="false" border_drop_shadow_visible="false"
+              font="SansSerif" mouse_opaque="true">
+    Login name:
+  </text>
+  <line_editor name="username_edit"
+               bottom_delta="-20" left_delta="0" height="20" width="250"
+               follows="left|bottom" font="SansSerif"
+               bevel_style="in" border_style="line" border_thickness="1"
+               max_length="31" mouse_opaque="true"
+               handle_edit_keys_directly="true"
+               select_all_on_focus_received="true"
+               allow_translate="false" />
  <!-- PASSWORD -->
        <text name="password_text" 
-              bottom_delta="20" left_delta="130" height="16" width="120"
+              bottom_delta="20" left="285" height="16" width="120"
        follows="left|bottom" h_pad="0" halign="left" v_pad="0"
        bg_visible="false" drop_shadow_visible="true"
        border_visible="false" border_drop_shadow_visible="false"
@@ -114,36 +108,70 @@
                     handle_edit_keys_directly="true"
               select_all_on_focus_received="true"
               allow_translate="false" />
-        <check_box name="remember_check" label="Remember password"
-             bottom_delta="-24" left_delta="0" height="16" width="140"
-             follows="left|bottom" font="SansSerifSmall" control_name="RememberPassword" 
-                   initial_value="false" mouse_opaque="true"  />
  <!-- GRIDS -->
-        <text name="grid_text" 
+  <text name="grid_text"
              bottom="80" left_delta="150" height="16" width="120"
        follows="left|bottom" h_pad="0" halign="left" v_pad="0"
        bg_visible="false" drop_shadow_visible="true"
        border_visible="false" border_drop_shadow_visible="false"
              font="SansSerif" mouse_opaque="true">
-                Grid:
+    Grid:
-        </text>
+  </text>
-        <combo_box name="server_combo"
+  <combo_box name="server_combo"
             bottom_delta="-20" left_delta="0" height="20" width="120"
             follows="left|bottom" allow_text_entry="false"
             max_chars="20" mouse_opaque="true" />
-        <button name="grid_btn" label="Grid Manager"
-          bottom_delta="-24" left_delta="10" height="16" width="100"
-          follows="left|bottom" font="SansSerifSmall" halign="center"
+  <!-- START LOCATION -->
-                      mouse_opaque="true" scale_image="TRUE" />
+  <text name="start_location_text"
+              bottom="32" left="10" height="16" right="115"
+        follows="left|bottom" h_pad="0" halign="right" v_pad="0"
+        bg_visible="false" drop_shadow_visible="true"
+        border_visible="false" border_drop_shadow_visible="false"
+              font="SansSerifSmall" mouse_opaque="true">
+    Start location:
+  </text>
+  <combo_box name="start_location_combo"
+             bottom_delta="2" left="120" height="16" width="150"
+             follows="left|bottom" font="SansSerifSmall"
+             mouse_opaque="true" allow_text_entry="true" max_chars="128">
+    <combo_item name="MyHome" value="My Home">
+      My Home
+    </combo_item>
+    <combo_item name="MyLastLocation" value="My Last Location">
+      My Last Location
+    </combo_item>
+    <combo_item name="Typeregionname" value="&lt;Type region name&gt;">
+      &lt;Type region name&gt;
+    </combo_item>
+  </combo_box>
+  <!-- REMEMBER PASSWORD -->
+  <check_box name="remember_check" label="Remember password"
+           bottom_delta="-2" left="282" height="16" width="140"
+           follows="left|bottom" font="SansSerifSmall" control_name="RememberPassword"
+           initial_value="false" mouse_opaque="true"  />
+  <!-- GRID MANAGER -->
+  
+  <button name="grid_btn" label="Grid Manager"
+        bottom_delta="0" left="434" height="20" width="100"
+        follows="left|bottom" font="SansSerifSmall" halign="center"
+        mouse_opaque="true" scale_image="TRUE" />
  <!-- LOG IN -->
        <button name="connect_btn" label="Log In"
-          bottom="58" left_delta="140" height="24" width="120"
+          bottom="58" left_delta="150" height="24" width="120"
          follows="left|bottom" font="SansSerif" halign="center"
                mouse_opaque="true" scale_image="TRUE" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index 1b771b5..b8f6e7d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -128,9 +128,6 @@
    </combo_item>
  </combo_box>-->
-    <button bottom="10" follows="left|bottom" font="SansSerif" height="20" width="250" 
-           label="Reset All Preferences To Default" name="reset_btn" left="12" 
-           tool_tip="Reset all preferences to their default values (requires a restart)" />
    </panel>
    
    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="SpellCheck"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
index 1f208e8..355d7e8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
@@ -9,13 +9,13 @@
                Volume:
        </text>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-190" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-202" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
             mouse_opaque="true" name="streaming_prefs_text" v_pad="0" width="128">
                Streaming:
        </text>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-285" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-315" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
             mouse_opaque="true" name="audio_prefs_text" v_pad="0" width="128">
                Audio:
@@ -47,7 +47,16 @@
             initial_value="true" label="Media helper widget" left="162"
             mouse_opaque="true" name="media_helper_widget" radio_style="false"
             width="338" />     
-        <check_box bottom_delta="-27" control_name="MuteWhenMinimized" enabled="true"
+        <check_box bottom_delta="-20" control_name="MediaEnableFilter" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="true" label="Filter media URLs" left="142"
+             mouse_opaque="true" name="enable_media_filter" radio_style="false"
+             width="200" />
+        <button name="show_media_filter" font="SansSerif" label="Media Filter Settings" halign="center"
+             tool_tip="Edit settings and the blocked and allowed lists for the Media Filter."
+             enabled="false" mouse_opaque="true" follows="top|right"
+             bottom_delta="-2" right="-15" height="20" width="180" />
+        <check_box bottom_delta="-33" control_name="MuteWhenMinimized" enabled="true"
             follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
             label="Mute audio when window minimized" left="142" mouse_opaque="true"
             name="mute_when_minimized" radio_style="false" width="215" />
diff --git a/linden/indra/newview/slfloatermediafilter.cpp b/linden/indra/newview/slfloatermediafilter.cpp
index c47ed26..b0d9c26 100644
--- a/linden/indra/newview/slfloatermediafilter.cpp
+++ b/linden/indra/newview/slfloatermediafilter.cpp
@@ -43,6 +43,8 @@
 SLFloaterMediaFilter* SLFloaterMediaFilter::sInstance = NULL;
 bool SLFloaterMediaFilter::sIsWhitelist = false;
+bool SLFloaterMediaFilter::sIsAdding = false;
+bool SLFloaterMediaFilter::sShowIPs = false;
 SLFloaterMediaFilter::SLFloaterMediaFilter() : LLFloater(std::string("media filter")), mIsDirty(false)
 {
@@ -62,15 +64,18 @@ BOOL SLFloaterMediaFilter::postBuild()
        if (mWhitelistSLC && mBlacklistSLC)
        {
                childSetAction("clear_lists", onClearLists, this);
+                childSetAction("show_ips", onShowIPs, this);
                childSetAction("add_whitelist", onWhitelistAdd, this);
                childSetAction("remove_whitelist", onWhitelistRemove, this);
                childSetAction("add_blacklist", onBlacklistAdd, this);
                childSetAction("remove_blacklist", onBlacklistRemove, this);
                childSetAction("commit_domain", onCommitDomain, this);
+                childSetAction("cancel_domain", onCancelDomain, this);
                childSetUserData("whitelist_list", this);
                childSetUserData("blacklist_list", this);
                mIsDirty = true;
        }
+        gSavedSettings.getControl("MediaEnableFilter")->getSignal()->connect(boost::bind(&onMediaEnableFilterChanged, _1));
        return TRUE;
 }
@@ -84,6 +89,8 @@ void SLFloaterMediaFilter::draw()
                mWhitelistSLC->deleteAllItems();
                mBlacklistSLC->deleteAllItems();
                std::set<std::string> listed;
+                LLHost host;
+                std::string ip;
                std::string domain;
                std::string action;
                LLSD element;
@@ -92,6 +99,16 @@ void SLFloaterMediaFilter::draw()
                for (S32 i = 0; i < (S32)LLViewerParcelMedia::sMediaFilterList.size(); i++)
                {
                        domain = LLViewerParcelMedia::sMediaFilterList[i]["domain"].asString();
+                        if (sShowIPs)
+                        {
+                                host.setHostByName(domain);
+                                ip = host.getIPString();
+                                if (ip != domain && domain.find('/') == std::string::npos)
+                                {
+                                        domain += " (" + ip + ")";
+                                }
+                        }
                        action = LLViewerParcelMedia::sMediaFilterList[i]["action"].asString();
                        if (!domain.empty() && action == "allow")
                        {       
@@ -123,6 +140,15 @@ void SLFloaterMediaFilter::draw()
                for (it = LLViewerParcelMedia::sAllowedMedia.begin(); it != LLViewerParcelMedia::sAllowedMedia.end(); it++)
                {
                        domain = *it;
+                        if (sShowIPs)
+                        {
+                                host.setHostByName(domain);
+                                ip = host.getIPString();
+                                if (ip != domain && domain.find('/') == std::string::npos)
+                                {
+                                        domain += " (" + ip + ")";
+                                }
+                        }
                        if (listed.count(domain) == 0)
                        {
                                element["columns"][0]["value"] = domain;
@@ -133,6 +159,15 @@ void SLFloaterMediaFilter::draw()
                for (it = LLViewerParcelMedia::sDeniedMedia.begin(); it != LLViewerParcelMedia::sDeniedMedia.end(); it++)
                {
                        domain = *it;
+                        if (sShowIPs)
+                        {
+                                host.setHostByName(domain);
+                                ip = host.getIPString();
+                                if (ip != domain && domain.find('/') == std::string::npos)
+                                {
+                                        domain += " (" + ip + ")";
+                                }
+                        }
                        if (listed.count(domain) == 0)
                        {
                                element["columns"][0]["value"] = domain;
@@ -142,26 +177,56 @@ void SLFloaterMediaFilter::draw()
                mWhitelistSLC->setScrollPos(whitescrollpos);
                mBlacklistSLC->setScrollPos(blackscrollpos);
-                if (!gSavedSettings.getBOOL("MediaEnableFilter"))
+                updateWidgets();
-                {
-                        childDisable("clear_lists");
-                        childDisable("blacklist_list");
-                        childDisable("whitelist_list");
-                        childDisable("remove_whitelist");
-                        childDisable("add_whitelist");
-                        childDisable("remove_blacklist");
-                        childDisable("add_blacklist");
-                        childDisable("input_domain");
-                        childDisable("commit_domain");
-                        childSetText("add_text", std::string("****** WARNING: media filtering is currently DISABLED ******"));
-                }
                mIsDirty = false;
+                sShowIPs = false;
        }
        LLFloater::draw();
 }
+void SLFloaterMediaFilter::updateWidgets()
+{
+        bool enabled = gSavedSettings.getBOOL("MediaEnableFilter");
+        childSetEnabled("clear_lists", enabled && !sIsAdding);
+        childSetEnabled("show_ips", enabled && !sIsAdding);
+        childSetEnabled("blacklist_list", enabled && !sIsAdding);
+        childSetEnabled("whitelist_list", enabled && !sIsAdding);
+        childSetEnabled("remove_whitelist", enabled && !sIsAdding);
+        childSetEnabled("add_whitelist", enabled && !sIsAdding);
+        childSetEnabled("remove_blacklist", enabled && !sIsAdding);
+        childSetEnabled("add_blacklist", enabled && !sIsAdding);
+        childSetEnabled("match_ip", enabled);
+        childSetEnabled("input_domain", enabled && sIsAdding);
+        childSetEnabled("commit_domain", enabled && sIsAdding);
+        childSetEnabled("cancel_domain", enabled && sIsAdding);
+        childSetEnabled("filter_only_remote", enabled);
+        childSetEnabled("info1", enabled);
+        childSetEnabled("info2", enabled);
+        std::string add_text("****** Media filtering is currently DISABLED ******");
+        if (enabled)
+        {
+                if (sIsAdding)
+                {
+                        if (sIsWhitelist)
+                        {
+                                add_text = "Enter the domain/url to add to the white list:";
+                        }
+                        else
+                        {
+                                add_text = "Enter the domain/url to add to the black list:";
+                        }
+                }
+                else
+                {
+                        add_text = "New Domain:";
+                }
+        }
+        childSetText("add_text", add_text);
+}
 void SLFloaterMediaFilter::setDirty()
 {
    if (sInstance)
@@ -208,23 +273,21 @@ void SLFloaterMediaFilter::onClearLists(void* data)
        LLViewerParcelMedia::clearDomainFilterList();
 }
+void SLFloaterMediaFilter::onShowIPs(void* data)
+{
+        sShowIPs = true;
+        setDirty();
+}
 void SLFloaterMediaFilter::onWhitelistAdd(void* data)
 {
    if (!sInstance)
        {
                return;
        }
-        sInstance->childDisable("clear_lists");
-        sInstance->childDisable("blacklist_list");
-        sInstance->childDisable("whitelist_list");
-        sInstance->childDisable("remove_whitelist");
-        sInstance->childDisable("add_whitelist");
-        sInstance->childDisable("remove_blacklist");
-        sInstance->childDisable("add_blacklist");
-        sInstance->childEnable("input_domain");
-        sInstance->childEnable("commit_domain");
-        sInstance->childSetText("add_text", std::string("Enter the domain/url to add to the white list:"));
        sIsWhitelist = true;
+        sIsAdding = true;
+        sInstance->updateWidgets();
 }
 void SLFloaterMediaFilter::onWhitelistRemove(void* data)
@@ -238,6 +301,12 @@ void SLFloaterMediaFilter::onWhitelistRemove(void* data)
        if (selected)
        {
                std::string domain = sInstance->mWhitelistSLC->getSelectedItemLabel();
+                size_t pos = domain.find(' ');
+                if (pos != std::string::npos)
+                {
+                        domain = domain.substr(0, pos);
+                }
                LLViewerParcelMedia::sAllowedMedia.erase(domain);
                for (S32 i = 0; i < (S32)LLViewerParcelMedia::sMediaFilterList.size(); i++)
@@ -245,11 +314,32 @@ void SLFloaterMediaFilter::onWhitelistRemove(void* data)
                        if (LLViewerParcelMedia::sMediaFilterList[i]["domain"].asString() == domain)
                        {
                                LLViewerParcelMedia::sMediaFilterList.erase(i);
-                                LLViewerParcelMedia::saveDomainFilterList();
                                break;
                        }
                }
+                if (sInstance->childGetValue("match_ip") && domain.find('/') == std::string::npos)
+                {
+                        LLHost host;
+                        host.setHostByName(domain);
+                        std::string ip = host.getIPString();
+                        if (ip != domain)
+                        {
+                                LLViewerParcelMedia::sAllowedMedia.erase(ip);
+                                for (S32 i = 0; i < (S32)LLViewerParcelMedia::sMediaFilterList.size(); i++)
+                                {
+                                        if (LLViewerParcelMedia::sMediaFilterList[i]["domain"].asString() == ip)
+                                        {
+                                                LLViewerParcelMedia::sMediaFilterList.erase(i);
+                                                break;
+                                        }
+                                }
+                        }
+                }
+                LLViewerParcelMedia::saveDomainFilterList();
                setDirty();
        }
 }
@@ -260,17 +350,9 @@ void SLFloaterMediaFilter::onBlacklistAdd(void* data)
        {
                return;
        }
-        sInstance->childDisable("clear_lists");
-        sInstance->childDisable("blacklist_list");
-        sInstance->childDisable("whitelist_list");
-        sInstance->childDisable("remove_whitelist");
-        sInstance->childDisable("add_whitelist");
-        sInstance->childDisable("remove_blacklist");
-        sInstance->childDisable("add_blacklist");
-        sInstance->childEnable("input_domain");
-        sInstance->childEnable("commit_domain");
-        sInstance->childSetText("add_text", std::string("Enter the domain/url to add to the black list:"));
        sIsWhitelist = false;
+        sIsAdding = true;
+        sInstance->updateWidgets();
 }
 void SLFloaterMediaFilter::onBlacklistRemove(void* data)
@@ -284,6 +366,12 @@ void SLFloaterMediaFilter::onBlacklistRemove(void* data)
        if (selected)
        {
                std::string domain = sInstance->mBlacklistSLC->getSelectedItemLabel();
+                size_t pos = domain.find(' ');
+                if (pos != std::string::npos)
+                {
+                        domain = domain.substr(0, pos);
+                }
                LLViewerParcelMedia::sDeniedMedia.erase(domain);
                for (S32 i = 0; i < (S32)LLViewerParcelMedia::sMediaFilterList.size(); i++)
@@ -291,11 +379,32 @@ void SLFloaterMediaFilter::onBlacklistRemove(void* data)
                        if (LLViewerParcelMedia::sMediaFilterList[i]["domain"].asString() == domain)
                        {
                                LLViewerParcelMedia::sMediaFilterList.erase(i);
-                                LLViewerParcelMedia::saveDomainFilterList();
                                break;
                        }
                }
+                if (sInstance->childGetValue("match_ip") && domain.find('/') == std::string::npos)
+                {
+                        LLHost host;
+                        host.setHostByName(domain);
+                        std::string ip = host.getIPString();
+                        if (ip != domain)
+                        {
+                                LLViewerParcelMedia::sDeniedMedia.erase(ip);
+                                for (S32 i = 0; i < (S32)LLViewerParcelMedia::sMediaFilterList.size(); i++)
+                                {
+                                        if (LLViewerParcelMedia::sMediaFilterList[i]["domain"].asString() == ip)
+                                        {
+                                                LLViewerParcelMedia::sMediaFilterList.erase(i);
+                                                break;
+                                        }
+                                }
+                        }
+                }
+                LLViewerParcelMedia::saveDomainFilterList();
                setDirty();
        }
 }       
@@ -308,6 +417,10 @@ void SLFloaterMediaFilter::onCommitDomain(void* data)
        }
        std::string domain = sInstance->childGetText("input_domain");
        domain = LLViewerParcelMedia::extractDomain(domain);
+        LLHost host;
+        host.setHostByName(domain);
+        std::string ip = host.getIPString();
+        bool match_ip = (sInstance->childGetValue("match_ip") && ip != domain && domain.find('/') == std::string::npos);
        if (!domain.empty())
        {
@@ -318,7 +431,18 @@ void SLFloaterMediaFilter::onCommitDomain(void* data)
                        if (LLViewerParcelMedia::sMediaFilterList[i]["domain"].asString() == domain)
                        {
                                LLViewerParcelMedia::sMediaFilterList.erase(i);
-                                break;
+                        }
+                }
+                if (match_ip)
+                {
+                        LLViewerParcelMedia::sDeniedMedia.erase(ip);
+                        LLViewerParcelMedia::sAllowedMedia.erase(ip);
+                        for (S32 i = 0; i < (S32)LLViewerParcelMedia::sMediaFilterList.size(); i++)
+                        {
+                                if (LLViewerParcelMedia::sMediaFilterList[i]["domain"].asString() == ip)
+                                {
+                                        LLViewerParcelMedia::sMediaFilterList.erase(i);
+                                }
                        }
                }
                LLSD newmedia;
@@ -332,19 +456,33 @@ void SLFloaterMediaFilter::onCommitDomain(void* data)
                        newmedia["action"] = "deny";
                }
                LLViewerParcelMedia::sMediaFilterList.append(newmedia);
+                if (match_ip)
+                {
+                        newmedia["domain"] = ip;
+                        LLViewerParcelMedia::sMediaFilterList.append(newmedia);
+                }
                LLViewerParcelMedia::saveDomainFilterList();
        }
-        sInstance->childEnable("clear_lists");
-        sInstance->childEnable("blacklist_list");
-        sInstance->childEnable("whitelist_list");
-        sInstance->childEnable("remove_whitelist");
-        sInstance->childEnable("add_whitelist");
-        sInstance->childEnable("remove_blacklist");
-        sInstance->childEnable("add_blacklist");
-        sInstance->childDisable("input_domain");
-        sInstance->childDisable("commit_domain");
-        sInstance->childSetText("add_text", std::string("New domain:"));
        sInstance->childSetText("input_domain", std::string(""));
+        sIsAdding = false;
+        setDirty();
+}
+//static
+void SLFloaterMediaFilter::onCancelDomain(void* data)
+{
+        if (!sInstance)
+        {
+                return;
+        }
+        sInstance->childSetText("input_domain", std::string(""));
+        sIsAdding = false;
+        setDirty();
+}
+//static
+void SLFloaterMediaFilter::onMediaEnableFilterChanged(const LLSD& newvalue)
+{
        setDirty();
 }
diff --git a/linden/indra/newview/slfloatermediafilter.h b/linden/indra/newview/slfloatermediafilter.h
index 0f900be..9067c74 100644
--- a/linden/indra/newview/slfloatermediafilter.h
+++ b/linden/indra/newview/slfloatermediafilter.h
@@ -38,6 +38,7 @@
 class LLScrollListCtrl;
 class LLButton;
+class LLSD;
 class SLFloaterMediaFilter : public LLFloater
 {
@@ -52,14 +53,22 @@ public:
        static void toggleInstance();
        static void onClearLists(void*);
+        static void onShowIPs(void*);
        static void onWhitelistAdd(void*);
        static void onWhitelistRemove(void*);
        static void onBlacklistAdd(void*);
        static void onBlacklistRemove(void*);
        static void onCommitDomain(void*);
+        static void onCancelDomain(void*);
+        static void onMediaEnableFilterChanged(const LLSD& newvalue);
+private:
+        void updateWidgets();
 private:
        static bool sIsWhitelist;
+        static bool sShowIPs;
+        static bool sIsAdding;
        LLScrollListCtrl* mWhitelistSLC;
        LLScrollListCtrl* mBlacklistSLC;
        bool mIsDirty;
diff --git a/linden/install.xml b/linden/install.xml
index 4e4a7c6..7ff8dc0 100755
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -179,9 +179,9 @@
          <key>common</key>
          <map>
            <key>md5sum</key>
-            <string>a6221f9f81be1f044ec1d32c93b11ad9</string>
+            <string>940f85fb8c629b7944688e812a089549</string>
            <key>url</key>
-            <uri>http://download.kokuaviewer.org/files/extras/imprudence-artwork-20110314.tar.bz2</uri>
+            <uri>http://download.kokuaviewer.org/files/extras/imprudence-artwork-20110321.tar.bz2</uri>
          </map>
        </map>
      </map>