New LLLayoutStack, and cursory LLPanelPrimMediaControl panel.

2013-06-13 04:28:15 -05:00
parent 72c186f0f4
commit e617ff0763
45 changed files with 1685 additions and 710 deletions
--- a/indra/llui/lllayoutstack.cpp
+++ b/indra/llui/lllayoutstack.cpp
--- a/indra/llui/lllayoutstack.h
+++ b/indra/llui/lllayoutstack.h
@@ -29,6 +29,7 @@
 #define LL_LLLAYOUTSTACK_H

 #include "llpanel.h"
+#include "llresizebar.h"


 class LLLayoutPanel;
@@ -41,73 +42,138 @@ public:
 	{
 		HORIZONTAL,
 		VERTICAL
-	} eLayoutOrientation;
+	} ELayoutOrientation;

-	LLLayoutStack(eLayoutOrientation orientation);
+	LLLayoutStack(ELayoutOrientation orientation, S32 border_size, bool animate, bool clip, F32 open_time_constant, F32 close_time_constant, F32 resize_bar_overlap);
 	virtual ~LLLayoutStack();

 	/*virtual*/ void draw();
-	/*virtual*/ LLXMLNodePtr getXML(bool save_children = true) const;
-	/*virtual*/ void removeChild(LLView* ctrl);
+	/*virtual*/ void removeChild(LLView*);
+	/*virtual*/ BOOL postBuild();
+	/*virtual*/ bool addChild(LLView* child, S32 tab_groupdatefractuiona = 0);
+	/*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);

+	/*virtual*/ LLXMLNodePtr getXML(bool save_children = true) const;
 	static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);

-	S32 getMinWidth() const { return mMinWidth; }
-	S32 getMinHeight() const { return mMinHeight; }
-	
 	typedef enum e_animate
 	{
 		NO_ANIMATE,
 		ANIMATE
 	} EAnimate;

-	void addPanel(LLPanel* panel, S32 min_width, S32 min_height, BOOL auto_resize, BOOL user_resize, EAnimate animate = NO_ANIMATE, S32 index = S32_MAX);
-	void removePanel(LLPanel* panel);
+	void addPanel(LLLayoutPanel* panel, EAnimate animate = NO_ANIMATE);
 	void collapsePanel(LLPanel* panel, BOOL collapsed = TRUE);
 	S32 getNumPanels() { return mPanels.size(); }

-	void updateLayout(BOOL force_resize = FALSE);
+	void updateLayout();

 	S32 getPanelSpacing() const { return mPanelSpacing; }
-private:
 	
-	void calcMinExtents();
-	S32 getDefaultHeight(S32 cur_height);
-	S32 getDefaultWidth(S32 cur_width);
+	static void updateClass();

-	const eLayoutOrientation mOrientation;
+protected:
+	LLLayoutStack(const Params&);
+	friend class LLUICtrlFactory;
+	friend class LLLayoutPanel;
+
+private:
+	void updateResizeBarLimits();
+	bool animatePanels();
+	void createResizeBar(LLLayoutPanel* panel);
+
+	const ELayoutOrientation mOrientation;

 	typedef std::vector<LLLayoutPanel*> e_panel_list_t;
 	e_panel_list_t mPanels;
-	LLLayoutPanel* findEmbeddedPanel(LLPanel* panelp) const;

-	S32 mMinWidth;
-	S32 mMinHeight;
+	LLLayoutPanel* findEmbeddedPanel(LLPanel* panelp) const;
+	LLLayoutPanel* findEmbeddedPanelByName(const std::string& name) const;
+	void updateFractionalSizes();
+	void normalizeFractionalSizes();
+	void updatePanelRect( LLLayoutPanel* param1, const LLRect& new_rect );
+
 	S32 mPanelSpacing;
+
+	// true if we already applied animation this frame
+	bool mAnimatedThisFrame;
+	bool mAnimate;
+	bool mClip;
+	F32  mOpenTimeConstant;
+	F32  mCloseTimeConstant;
+	bool mNeedsLayout;
+	S32  mResizeBarOverlap;
 }; // end class LLLayoutStack

-class LLLayoutPanel
-{
-	friend class LLLayoutStack;
-	friend class LLUICtrlFactory;
-	friend struct DeletePointer;
-	LLLayoutPanel(LLPanel* panelp, LLLayoutStack::eLayoutOrientation orientation, S32 min_width, S32 min_height, BOOL auto_resize, BOOL user_resize);

+class LLLayoutPanel : public LLPanel
+{
+friend class LLLayoutStack;
+friend class LLUICtrlFactory;
+public:
 	~LLLayoutPanel();

-	F32 getCollapseFactor();
-	LLPanel* mPanel;
-	S32 mMinWidth;
-	S32 mMinHeight;
-	bool mAutoResize;
-	bool mUserResize;
-	bool mCollapsed;
+	void initFromParams(const Params& p);
+	static LLView* fromXML(LLXMLNodePtr node, LLView* parent, LLUICtrlFactory *factory);

+	void handleReshape(const LLRect& new_rect, bool by_user);

-	F32 mVisibleAmt;
-	F32 mCollapseAmt;
-	LLLayoutStack::eLayoutOrientation mOrientation;
+	void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
+	
+
+	void setVisible(BOOL visible);
+
+	S32 getLayoutDim() const;
+	S32 getTargetDim() const;
+	void setTargetDim(S32 value);
+	S32 getMinDim() const { return llmax(0, mMinDim); }
+	void setMinDim(S32 value) { mMinDim = value; }
+
+	S32 getExpandedMinDim() const { return mExpandedMinDim >= 0 ? mExpandedMinDim : getMinDim(); }
+	void setExpandedMinDim(S32 value) { mExpandedMinDim = value; }
+	
+	S32 getRelevantMinDim() const
+	{
+		S32 min_dim = mMinDim;
+		
+		if (!mCollapsed)
+		{
+			min_dim = getExpandedMinDim();
+		}
+		
+		return min_dim;
+	}
+
+	F32 getAutoResizeFactor() const;
+	F32 getVisibleAmount() const;
+	S32 getVisibleDim() const;
+	LLResizeBar* getResizeBar() { return mResizeBar; }
+
+	bool isCollapsed() const { return mCollapsed;}
+
+	void setOrientation(LLLayoutStack::ELayoutOrientation orientation);
+	void storeOriginalDim();
+
+	void setIgnoreReshape(bool ignore) { mIgnoreReshape = ignore; }
+
+protected:
+	LLLayoutPanel(S32 min_dim=-1, BOOL auto_resize=TRUE, BOOL user_resize=TRUE, LLRect rect = LLRect());
+	BOOL initPanelXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
+	
+	bool	mAutoResize;
+	bool	mUserResize;
+
+	S32		mExpandedMinDim;
+	S32		mMinDim;
+	bool	mCollapsed;
+	F32		mVisibleAmt;
+	F32		mCollapseAmt;
+	F32		mFractionalSize;
+	S32		mTargetDim;
+	bool	mIgnoreReshape;
+	LLLayoutStack::ELayoutOrientation mOrientation;
 	class LLResizeBar* mResizeBar;
 };

-#endif //LL_LLLAYOUTSTACK_H
+
+#endif
--- a/indra/llui/lltextbox.cpp
+++ b/indra/llui/lltextbox.cpp
@@ -197,12 +197,16 @@ void LLTextBox::setWrappedText(const LLStringExplicit& in_text, F32 max_width)
 	{
 		max_width = (F32)getRect().getWidth();
 	}
+	if(max_width <= 0.0f)
+	{
+		return;	//It makes no sense to try to wrap text to fit zero-width columns. (In fact, it causes infinite recursion in the following while loop!)
+	}

 	LLWString wtext = utf8str_to_wstring(in_text);
 	LLWString final_wtext;

 	LLWString::size_type  cur = 0;;
-	LLWString::size_type  len = wtext.size();
+	LLWString::size_type  len = wtext.length();

 	while (cur < len)
 	{
--- a/indra/newview/llchatbar.cpp
+++ b/indra/newview/llchatbar.cpp
@@ -111,7 +111,7 @@ private:
 //

 LLChatBar::LLChatBar() 
-:	LLPanel(LLStringUtil::null, LLRect(), BORDER_NO),
+:	LLLayoutPanel(),
 	mInputEditor(NULL),
 	mGestureLabelTimer(),
 	mLastSpecialChatChannel(0),
--- a/indra/newview/llchatbar.h
+++ b/indra/newview/llchatbar.h
@@ -36,6 +36,7 @@
 #include "llpanel.h"
 #include "llframetimer.h"
 #include "llchat.h"
+#include "lllayoutstack.h"

 class LLLineEditor;
 class LLMessageSystem;
@@ -46,7 +47,7 @@ class LLChatBarGestureObserver;
 class LLComboBox;

 class LLChatBar
-:	public LLPanel
+:	public LLLayoutPanel
 {
 public:
 	// constructor for inline chat-bars (e.g. hosted in chat history window)
--- a/indra/newview/llfloateractivespeakers.h
+++ b/indra/newview/llfloateractivespeakers.h
@@ -39,6 +39,7 @@
 #include "llvoiceclient.h"
 #include "llframetimer.h"
 #include "llevent.h"
+#include "lllayoutstack.h"

 #include <list>
 #include <boost/signals2.hpp>
@@ -209,7 +210,7 @@ protected:
 	LLPanelActiveSpeakers*	mPanel;
 };

-class LLPanelActiveSpeakers : public LLPanel
+class LLPanelActiveSpeakers : public LLLayoutPanel
 {
 public:
 	LLPanelActiveSpeakers(LLSpeakerMgr* data_source, BOOL show_text_chatters);
--- a/indra/newview/llfloaternotificationsconsole.cpp
+++ b/indra/newview/llfloaternotificationsconsole.cpp
@@ -43,7 +43,7 @@
 const S32 NOTIFICATION_PANEL_HEADER_HEIGHT = 20;
 const S32 HEADER_PADDING = 38;

-class LLNotificationChannelPanel : public LLPanel
+class LLNotificationChannelPanel : public LLLayoutPanel
 {
 public:
 	LLNotificationChannelPanel(const std::string& channel_name);
@@ -59,8 +59,9 @@ private:
 };

 LLNotificationChannelPanel::LLNotificationChannelPanel(const std::string& channel_name) 
-	: LLPanel(channel_name)
+	: LLLayoutPanel(NOTIFICATION_PANEL_HEADER_HEIGHT,true,true)
 {
+	setName(channel_name);
 	mChannelPtr = LLNotifications::instance().getChannel(channel_name);
 	mChannelRejectsPtr = LLNotificationChannelPtr(
 												  LLNotificationChannel::buildChannel(channel_name + "rejects", mChannelPtr->getParentChannelName(), !boost::bind(mChannelPtr->getFilter(), _1)));
@@ -203,7 +204,7 @@ void LLFloaterNotificationConsole::addChannel(const std::string& name, bool open
 {
 	LLLayoutStack& stack = getChildRef<LLLayoutStack>("notification_channels");
 	LLNotificationChannelPanel* panelp = new LLNotificationChannelPanel(name);
-	stack.addPanel(panelp, 0, NOTIFICATION_PANEL_HEADER_HEIGHT, TRUE, TRUE, LLLayoutStack::ANIMATE);
+	stack.addPanel(panelp, LLLayoutStack::ANIMATE);

 	LLButton& header_button = panelp->getChildRef<LLButton>("header");
 	header_button.setToggleState(!open);
@@ -217,7 +218,7 @@ void LLFloaterNotificationConsole::removeChannel(const std::string& name)
 	LLPanel* panelp = getChild<LLPanel>(name, TRUE, FALSE);
 	if (panelp)
 	{
-		getChildRef<LLLayoutStack>("notification_channels").removePanel(panelp);
+		getChildRef<LLLayoutStack>("notification_channels").removeChild(panelp);
 		delete panelp;
 	}

--- a/indra/newview/lloverlaybar.cpp
+++ b/indra/newview/lloverlaybar.cpp
@@ -115,9 +115,7 @@ void* LLOverlayBar::createVoiceRemote(void* userdata)

 void* LLOverlayBar::createAdvSettings(void* userdata)
 {
-	LLOverlayBar *self = (LLOverlayBar*)userdata;	
-	self->mAdvSettings = new wlfPanel_AdvSettings();
-	return self->mAdvSettings;
+	return wlfPanel_AdvSettings::getInstance();
 }

 void* LLOverlayBar::createAORemote(void* userdata)
@@ -134,7 +132,7 @@ void* LLOverlayBar::createChatBar(void* userdata)
 }

 LLOverlayBar::LLOverlayBar()
-	:	LLPanel(),
+	:	LLLayoutPanel(),
 		mMediaRemote(NULL),
 		mVoiceRemote(NULL),
 		mAORemote(NULL),
@@ -159,8 +157,18 @@ LLOverlayBar::LLOverlayBar()
 bool updateAdvSettingsPopup(const LLSD &data)
 {
 	LLOverlayBar::sAdvSettingsPopup = gSavedSettings.getBOOL("wlfAdvSettingsPopup");
-	gOverlayBar->childSetVisible("AdvSettings_container", !LLOverlayBar::sAdvSettingsPopup);
-	gOverlayBar->childSetVisible("AdvSettings_container_exp", LLOverlayBar::sAdvSettingsPopup);
+	wlfPanel_AdvSettings::updateClass();
+	if(LLLayoutStack* layout_stack = gOverlayBar->findChild<LLLayoutStack>("overlay_layout_panel"))
+	{
+		LLLayoutPanel* layout_panel = layout_stack->findChild<LLLayoutPanel>("AdvSettings_container");
+		if(layout_panel)
+		{
+			layout_stack->collapsePanel(layout_panel,LLOverlayBar::sAdvSettingsPopup);
+			if(!LLOverlayBar::sAdvSettingsPopup)
+				layout_panel->setTargetDim(layout_panel->getChild<LLView>("Adv_Settings")->getBoundingRect().getWidth());
+		}
+	}
+	
 	return true;
 }

@@ -210,10 +218,19 @@ BOOL LLOverlayBar::postBuild()
 	gSavedSettings.getControl("wlfAdvSettingsPopup")->getSignal()->connect(boost::bind(&updateAdvSettingsPopup,_2));
 	gSavedSettings.getControl("ChatVisible")->getSignal()->connect(boost::bind(&updateChatVisible,_2));
 	gSavedSettings.getControl("EnableAORemote")->getSignal()->connect(boost::bind(&updateAORemote,_2));
-	childSetVisible("AdvSettings_container", !sAdvSettingsPopup);
-	childSetVisible("AdvSettings_container_exp", sAdvSettingsPopup);
 	childSetVisible("ao_remote_container", gSavedSettings.getBOOL("EnableAORemote"));	

+	wlfPanel_AdvSettings::updateClass();
+	if(LLLayoutStack* layout_stack = findChild<LLLayoutStack>("overlay_layout_panel"))
+	{
+		LLLayoutPanel* layout_panel = layout_stack->findChild<LLLayoutPanel>("AdvSettings_container");
+		if(layout_panel)
+		{
+			layout_stack->collapsePanel(layout_panel,LLOverlayBar::sAdvSettingsPopup);
+			if(!LLOverlayBar::sAdvSettingsPopup)
+				layout_panel->setTargetDim(layout_panel->getChild<LLView>("Adv_Settings")->getBoundingRect().getWidth());
+		}
+	}

 	return TRUE;
 }
@@ -342,7 +359,6 @@ void LLOverlayBar::refresh()
 			childSetVisible("media_remote_container", FALSE);
 			childSetVisible("voice_remote_container", FALSE);
 			childSetVisible("AdvSettings_container", FALSE);
-			childSetVisible("AdvSettings_container_exp", FALSE);
 			childSetVisible("ao_remote_container", FALSE);
 			childSetVisible("state_management_buttons_container", FALSE);
 		}
@@ -351,8 +367,7 @@ void LLOverlayBar::refresh()
 			// update "remotes"
 			childSetVisible("media_remote_container", TRUE);
 			childSetVisible("voice_remote_container", LLVoiceClient::voiceEnabled());
-			childSetVisible("AdvSettings_container", !sAdvSettingsPopup);//!gSavedSettings.getBOOL("wlfAdvSettingsPopup")); 
-			childSetVisible("AdvSettings_container_exp", sAdvSettingsPopup);//gSavedSettings.getBOOL("wlfAdvSettingsPopup")); 
+			childSetVisible("AdvSettings_container", TRUE);
 			childSetVisible("ao_remote_container", gSavedSettings.getBOOL("EnableAORemote"));
 			childSetVisible("state_management_buttons_container", TRUE);
 		}
--- a/indra/newview/lloverlaybar.h
+++ b/indra/newview/lloverlaybar.h
@@ -34,6 +34,7 @@
 #define LL_LLOVERLAYBAR_H

 #include "llpanel.h"
+#include "lllayoutstack.h"

 // "Constants" loaded from settings.xml at start time
 extern S32 STATUS_BAR_HEIGHT;
@@ -55,7 +56,7 @@ class AORemoteCtrl;
 class LLChatBar;

 class LLOverlayBar
-:	public LLPanel
+:	public LLLayoutPanel
 {
 public:
 	LLOverlayBar();
@@ -112,7 +113,6 @@ protected:
 	LLMediaRemoteCtrl*	mMediaRemote;
 	LLVoiceRemoteCtrl*	mVoiceRemote;
 	LLButton*	mCancelBtn;
-	wlfPanel_AdvSettings*	mAdvSettings;
 	AORemoteCtrl*			mAORemote;
 	bool mBuilt;	// dialog constructed yet?
 	enum { STOPPED=0, PLAYING=1, PAUSED=2 };
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1665,8 +1665,6 @@ bool idle_startup()
 		// object is created.  I think this must be done after setting the region.  JC
 		gAgent.setPositionAgent(agent_start_position_region);

-		wlfPanel_AdvSettings::fixPanel();
-
 		display_startup();
 		LLStartUp::setStartupState( STATE_MULTIMEDIA_INIT );
 		return FALSE;
--- a/indra/newview/lltoolbar.cpp
+++ b/indra/newview/lltoolbar.cpp
@@ -115,7 +115,7 @@ F32	LLToolBar::sInventoryAutoOpenTime = 1.f;
 //

 LLToolBar::LLToolBar()
-:	LLPanel()
+:	LLLayoutPanel()
 #if LL_DARWIN
 	, mResizeHandle(NULL)
 #endif // LL_DARWIN
--- a/indra/newview/lltoolbar.h
+++ b/indra/newview/lltoolbar.h
@@ -34,6 +34,7 @@
 #define LL_LLTOOLBAR_H

 #include "llpanel.h"
+#include "lllayoutstack.h"

 #include "llframetimer.h"

@@ -47,7 +48,7 @@ extern S32 TOOL_BAR_HEIGHT;
 class LLFlyoutButton;

 class LLToolBar
-:	public LLPanel
+:	public LLLayoutPanel
 {
 public:
 	LLToolBar();
--- a/indra/newview/llviewermediafocus.cpp
+++ b/indra/newview/llviewermediafocus.cpp
@@ -419,13 +419,13 @@ void LLViewerMediaFocus::update()
 		// We have an object and impl to point at.
 		
 		// Make sure the media HUD object exists.
-		/*if(! mMediaControls.get())
+		if(! mMediaControls.get())
 		{
 			LLPanelPrimMediaControls* media_controls = new LLPanelPrimMediaControls();
 			mMediaControls = media_controls->getHandle();
 			gHUDView->addChild(media_controls);	
 		}
-		mMediaControls.get()->setMediaFace(viewer_object, face, media_impl, normal);*/
+		mMediaControls.get()->setMediaFace(viewer_object, face, media_impl, normal);
 	}
 	else
 	{
@@ -434,6 +434,7 @@ void LLViewerMediaFocus::update()
 		{
 			mMediaControls.get()->setMediaFace(NULL, 0, NULL);
 		}
+		
 	}
 }

--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -2459,6 +2459,7 @@ void LLViewerWindow::reshape(S32 width, S32 height)
 		LLViewerStats::getInstance()->setStat(LLViewerStats::ST_WINDOW_WIDTH, (F64)width);
 		LLViewerStats::getInstance()->setStat(LLViewerStats::ST_WINDOW_HEIGHT, (F64)height);
 		gResizeScreenTexture = TRUE;
+		LLLayoutStack::updateClass();
 	}
 }

@@ -3038,6 +3039,8 @@ void LLViewerWindow::updateUI()
 	LLFastTimer t(ftm);

 	static std::string last_handle_msg;
+	// animate layout stacks so we have up to date rect for world view
+	LLLayoutStack::updateClass();

 	LLView::sMouseHandlerMessage.clear();

--- a/indra/newview/skins/default/textures/go-home-4.png
+++ b/indra/newview/skins/default/textures/go-home-4.png
--- a/indra/newview/skins/default/textures/go-media-pause.png
+++ b/indra/newview/skins/default/textures/go-media-pause.png
--- a/indra/newview/skins/default/textures/go-media-play.png
+++ b/indra/newview/skins/default/textures/go-media-play.png
--- a/indra/newview/skins/default/textures/go-media-skip-backwards.png
+++ b/indra/newview/skins/default/textures/go-media-skip-backwards.png
--- a/indra/newview/skins/default/textures/go-media-skip-forward.png
+++ b/indra/newview/skins/default/textures/go-media-skip-forward.png
--- a/indra/newview/skins/default/textures/go-media-stop.png
+++ b/indra/newview/skins/default/textures/go-media-stop.png
--- a/indra/newview/skins/default/textures/go-media-unzoom.png
+++ b/indra/newview/skins/default/textures/go-media-unzoom.png
--- a/indra/newview/skins/default/textures/go-media-zoom.png
+++ b/indra/newview/skins/default/textures/go-media-zoom.png
--- a/indra/newview/skins/default/textures/go-next-4.png
+++ b/indra/newview/skins/default/textures/go-next-4.png
--- a/indra/newview/skins/default/textures/go-previous-4.png
+++ b/indra/newview/skins/default/textures/go-previous-4.png
--- a/indra/newview/skins/default/textures/view-refresh-5.png
+++ b/indra/newview/skins/default/textures/view-refresh-5.png
--- a/indra/newview/skins/default/textures/go-stop.png
+++ b/indra/newview/skins/default/textures/go-stop.png
--- a/indra/newview/skins/default/textures/lock.png
+++ b/indra/newview/skins/default/textures/lock.png
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -403,11 +403,13 @@
  <texture name="media_panel_divider.png"/>
  <texture name="media_panel_scrollbg.png"/>
  
-  <texture name="go-previous-4.png"/>
-  <texture name="go-next-4.png"/>
-  <texture name="view-refresh-5.png"/>
-  <texture name="go-home-4.png"/>
-
+  <texture name="go-previous.png"/>
+  <texture name="go-next.png"/>
+  <texture name="go-reload.png"/>
+  <texture name="go-home.png"/>
+  <texture name="go-media-play.png"/>
+  <texture name="go-media-stop.png"/>
+  
  <texture name="Inv_WindLight.png" preload="true"/>
  <texture name="Inv_WaterLight.png" preload="true"/>

--- a/indra/newview/skins/default/xui/en-us/floater_directory.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_directory.xml
@@ -27,11 +27,11 @@
 			     select_on_focus="false" tab_group="1" tool_tip="Search Second Life"
 			     width="160" spell_check="true" />
      <button bottom="-26" follows="top|right" font="SansSerifSmall" height="25"
-           label="" left="230" name="back_btn" width="25" image_overlay="go-previous-4.png"/>
+           label="" left="230" name="back_btn" width="25" image_overlay="go-previous.png"/>
      <button bottom="-26" follows="top|right" font="SansSerifSmall" height="25"
-			     label="" left_delta="27" name="forward_btn" width="25" image_overlay="go-next-4.png" />
+			     label="" left_delta="27" name="forward_btn" width="25" image_overlay="go-next.png" />
      <button bottom="-26" follows="top|right" font="SansSerifSmall" height="25"
-			     label="" left_delta="27" name="reload_btn" width="25" image_overlay="view-refresh-5.png"/>
+			     label="" left_delta="27" name="reload_btn" width="25" image_overlay="go-reload.png"/>
 			<button bottom="-48" follows="top|right" font="SansSerif" height="20"
 			     label="Search" left="121" name="search_btn" width="95" />
 			<combo_box allow_text_entry="false" bottom="-46" follows="right|top" height="18"
@@ -318,17 +318,17 @@
        <string name="not_found_text">None Found.</string>
        <button bottom="-30" follows="top|left" font="SansSerifSmall" height="25"
          label=""
-          image_overlay="go-previous-4.png"
+          image_overlay="go-previous.png"
          left="10"
          name="back_btn" width="25" />
        <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="25"
          label=""
-          image_overlay="go-next-4.png"
+          image_overlay="go-next.png"
          left_delta="27"
          name="forward_btn" width="25" />
        <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="25"
         label=""
-         image_overlay="view-refresh-5.png"
+         image_overlay="go-reload.png"
         left_delta="27"
         name="reload_btn" width="25" />
        <!-- No mature content checkbox, showcase is all PG -->
@@ -690,9 +690,9 @@ To buy direct, visit the land and click on the place name in the title bar.
 			     mouse_opaque="true" name="result_text" v_pad="0" width="328" />
    </panel>
    <panel bottom="-549" follows="all" height="533" label="Marketplace" left="1" mouse_opaque="false" name="market_panel" width="778">
-      <button bottom="-30" follows="top|left" height="25" label="" left="10" name="back_btn" width="25" image_overlay="go-previous-4.png"/>
-      <button bottom_delta="0" follows="top|left" height="25" label="" left_delta="27" name="forward_btn" width="25" image_overlay="go-next-4.png" />
-      <button bottom_delta="0" follows="top|left" height="25" label="" left_delta="27" name="reload_btn" width="25" image_overlay="view-refresh-5.png"/>
+      <button bottom="-30" follows="top|left" height="25" label="" left="10" name="back_btn" width="25" image_overlay="go-previous.png"/>
+      <button bottom_delta="0" follows="top|left" height="25" label="" left_delta="27" name="forward_btn" width="25" image_overlay="go-next.png" />
+      <button bottom_delta="0" follows="top|left" height="25" label="" left_delta="27" name="reload_btn" width="25" image_overlay="go-reload.png"/>
      <web_browser name="market_browser" trusted_content="true" bottom="25" follows="all" left="10" right="-10" top="-40"/>
      <text bottom="5" follows="bottom|left" left="10" height="16" name="status_text"/>
      <string name="loading_text">Loading...</string>
--- a/indra/newview/skins/default/xui/en-us/floater_directory2.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_directory2.xml
@@ -626,10 +626,10 @@ To buy direct, visit the land and click on the place name in the title bar.
 			     mouse_opaque="true" name="result_text" v_pad="0" width="328" />
 		</panel>
    <panel bottom="-549" follows="all" height="533" label="Marketplace" left="1" mouse_opaque="false" name="market_panel" width="778">
-      <button bottom="-30" follows="top|left" height="25" label="" left="10" name="back_btn" width="25" image_overlay="go-previous-4.png"/>
-      <button bottom_delta="0" follows="top|left" height="25" label="" left_delta="27" name="forward_btn" width="25" image_overlay="go-next-4.png" />
+      <button bottom="-30" follows="top|left" height="25" label="" left="10" name="back_btn" width="25" image_overlay="go-previous.png"/>
+      <button bottom_delta="0" follows="top|left" height="25" label="" left_delta="27" name="forward_btn" width="25" image_overlay="go-next.png" />
      <button bottom_delta="0" follows="top|left" height="25" label="" left_delta="27" name="reload_btn" width="25" image_overlay="view-refresh-5.png"/>
-      <button bottom_delta="0" follows="top|left" height="25" label="" tooltip="reset" left_delta="27" name="reset_btn" width="25" image_overlay="go-home-4.png"/>
+      <button bottom_delta="0" follows="top|left" height="25" label="" tooltip="reset" left_delta="27" name="reset_btn" width="25" image_overlay="go-reload.png"/>
      <web_browser name="market_browser" trusted_content="true" bottom="25" follows="all" left="10" right="-10" top="-40"/>
      <text bottom="5" follows="bottom|left" left="10" height="16" name="status_text"/>
      <string name="loading_text">Loading...</string>
--- a/indra/newview/skins/default/xui/en-us/floater_directory3.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_directory3.xml
@@ -86,11 +86,11 @@
 			     select_on_focus="false" tab_group="1" tool_tip="Search Second Life"
 			     width="160" spell_check="true" />
 			<button bottom="-26" follows="top|right" font="SansSerifSmall" height="25" 
-            label="" left="230" name="back_btn" width="25" image_overlay="go-previous-4.png"/>
+            label="" left="230" name="back_btn" width="25" image_overlay="go-previous.png"/>
 			<button bottom="-26" follows="top|right" font="SansSerifSmall" height="25"
-			     label="" left_delta="27" name="forward_btn" width="25" image_overlay="go-next-4.png" />
+			     label="" left_delta="27" name="forward_btn" width="25" image_overlay="go-next.png" />
      <button bottom="-26" follows="top|right" font="SansSerifSmall" height="25"
-			     label="" left_delta="27" name="reload_btn" width="25" image_overlay="view-refresh-5.png"/>
+			     label="" left_delta="27" name="reload_btn" width="25" image_overlay="go-reload.png"/>
 			<button bottom="-48" follows="top|right" font="SansSerif" height="20"
 			     label="Search" left="121" name="search_btn" width="95" />
 			<combo_box allow_text_entry="false" bottom="-46" follows="right|top" height="18"
@@ -377,17 +377,17 @@
        <string name="not_found_text">None Found.</string>
        <button bottom="-30" follows="top|left" font="SansSerifSmall" height="25"
          label=""
-          image_overlay="go-previous-4.png"
+          image_overlay="go-previous.png"
          left="10"
          name="back_btn" width="25" />
        <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="25"
          label=""
-          image_overlay="go-next-4.png"
+          image_overlay="go-next.png"
          left_delta="27"
          name="forward_btn" width="25" />
        <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="25"
         label=""
-         image_overlay="view-refresh-5.png"
+         image_overlay="go-reload.png"
         left_delta="27"
         name="reload_btn" width="25" />
        <!-- No mature content checkbox, showcase is all PG -->
@@ -749,10 +749,10 @@ To buy direct, visit the land and click on the place name in the title bar.
 			     mouse_opaque="true" name="result_text" v_pad="0" width="328" />
    </panel>
    <panel bottom="-549" follows="all" height="533" label="Marketplace" left="1" mouse_opaque="false" name="market_panel" width="778">
-      <button bottom="-30" follows="top|left" height="25" label="" left="10" name="back_btn" width="25" image_overlay="go-previous-4.png"/>
-      <button bottom_delta="0" follows="top|left" height="25" label="" left_delta="27" name="forward_btn" width="25" image_overlay="go-next-4.png" />
-      <button bottom_delta="0" follows="top|left" height="25" label="" left_delta="27" name="reload_btn" width="25" image_overlay="view-refresh-5.png"/>
-      <button bottom_delta="0" follows="top|left" height="25" label="" tooltip="reset" left_delta="27" name="reset_btn" width="25" image_overlay="go-home-4.png"/>
+      <button bottom="-30" follows="top|left" height="25" label="" left="10" name="back_btn" width="25" image_overlay="go-previous.png"/>
+      <button bottom_delta="0" follows="top|left" height="25" label="" left_delta="27" name="forward_btn" width="25" image_overlay="go-next.png" />
+      <button bottom_delta="0" follows="top|left" height="25" label="" left_delta="27" name="reload_btn" width="25" image_overlay="go-reload.png"/>
+      <button bottom_delta="0" follows="top|left" height="25" label="" tooltip="reset" left_delta="27" name="reset_btn" width="25" image_overlay="go-home.png"/>
      <web_browser name="market_browser" trusted_content="true" bottom="25" follows="all" left="10" right="-10" top="-40"/>
      <text bottom="5" follows="bottom|left" left="10" height="16" name="status_text"/>
      <string name="loading_text">Loading...</string>
--- a/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
-     height="440" min_height="140" min_width="467" name="floater_about"
-     rect_control="FloaterMediaRect" title="Media Browser" width="820">
-	<layout_stack name="stack1" bottom="0" follows="left|right|top|bottom" left="10" top="-20" width="800">
-		<layout_panel auto_resize="false" bottom="0" height="25" left="0" name="nav_controls" user_resize="false"
-		     width="800">
-			<button bottom="0" follows="left|top" height="25" label="" image_overlay="go-previous-4.png" left="0" name="back"
-			     width="25" />
-			<button bottom_delta="0" follows="left|top" height="25" label="" image_overlay="go-next-4.png" left_delta="27"
-			     name="forward" width="25" />
-			<button bottom_delta="0" enabled="false" follows="left|top" height="25" label="" image_overlay="view-refresh-5.png" 
-			     left_delta="27" name="reload" width="25" />
-			<combo_box allow_text_entry="true" bottom_delta="4" follows="left|top|right" height="20"
-			     left_delta="29" max_chars="255" name="address" width="657" />
-			<button bottom_delta="-4" enabled="false" follows="right|top" height="25" label="Go" font="SansSerif" 
-			     left_delta="660" name="go" width="55" />
-			<!--button bottom_delta="0" enabled="true" follows="right|top" height="25" label="" image_overlay="go-home-4.png" 
-			     left_delta="58" name="home" width="35" /-->
-		</layout_panel>
-    <layout_panel auto_resize="false" bottom="0" height="20" left="0" name="time_controls" user_resize="false"
-		     width="800">
-      <button bottom="0" follows="left|top" height="20" label="rewind" left="0" name="rewind"
-			     width="55" />
-      <button bottom_delta="0" follows="left|top" height="20" label="" left_delta="55"
-			     name="play" width="55" image_unselected="button_anim_play.tga"	image_selected="button_anim_play_selected.tga" scale_image="true" />
-      <button bottom_delta="0" follows="left|top" height="20" label="" left_delta="0"
-			     name="pause" width="55" image_unselected="button_anim_pause.tga"	image_selected="button_anim_pause_selected.tga" scale_image="true" />
-      <button bottom_delta="0" follows="left|top" height="20" label="stop"
-			     left_delta="65" name="stop" width="55" />
-      <button bottom_delta="0" follows="left|top" height="20" label="forward"
-			     left_delta="75" name="seek" width="55" />
-    </layout_panel>
-    <layout_panel auto_resize="false" bottom="0" height="20" left="0"
-		     name="parcel_owner_controls" user_resize="false" width="540">
-			<button bottom="0" enabled="false" follows="left|top" height="22"
-			     label="Send Current URL To Parcel" left="0" name="assign" width="200" />
-		</layout_panel>
-		<layout_panel auto_resize="true" bottom="0" height="20" left="0" name="external_controls" user_resize="false"
-		     width="540">
-			<web_browser bottom="30" follows="left|right|top|bottom" left="0" name="browser" top="20"
-			     width="540" />
-			<button bottom="5" follows="bottom|left" height="20" label="Open in My Web Browser"
-			     left="0" name="open_browser" width="185" />
-			<check_box bottom="5" control_name="UseExternalBrowser" follows="bottom|left" height="20"
-			     label="Always open in my web browser" left_delta="190" name="open_always"
-			     width="200" />
-			<!--button bottom="5" follows="bottom|right" height="20" label="Close" left="-70"
-			     name="close" width="70" /-->
-		</layout_panel>
-	</layout_stack>
-  <string name="home_page_url">
-    http://www.secondlife.com
-  </string>
-  <string name="support_page_url">
-    http://wiki.secondlife.com/wiki/Knowledge_Base
-  </string>
-</floater>
--- a/indra/newview/skins/default/xui/en-us/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_web_content.xml
@@ -35,7 +35,7 @@
        follows="left|top"
 	height="25"
 	label=""
-	image_overlay="go-previous-4.png"
+	image_overlay="go-previous.png"
 	left="0"
 	name="back"
        width="25" >
@@ -46,7 +46,7 @@
        bottom_delta="0"
 	follows="left|top"
 	height="25" label=""
-	image_overlay="go-next-4.png"
+	image_overlay="go-next.png"
 	left_delta="27"
        name="forward"
 	width="25" >
@@ -59,7 +59,7 @@
 	follows="left|top"
 	height="25"
 	label=""
-	image_overlay="media_btn_stoploading.png"
+	image_overlay="go-stop.png"
 	name="stop"
 	left_delta="27"
 	width="25">
@@ -71,7 +71,7 @@
 	follows="left|top"
 	height="25"
 	label=""
-	image_overlay="view-refresh-5.png" 
+	image_overlay="go-reload.png" 
 	name="reload"
 	left_delta="0"
 	width="25" >
--- a/indra/newview/skins/default/xui/en-us/panel_notifications_channel.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_notifications_channel.xml
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="notifications_panel" width="100" height="100" user_resize="true" >
  <layout_stack name="stack1" left="0" bottom="2" width="100" height="78" follows="left|right|top|bottom" orientation="horizontal" >
-    <scroll_list user_resize="true"  draw_heading="true" left="0" bottom="0" width="100" height="78" follows="left|right|top|bottom" name="notifications_list" sort_column="2" sort_ascending="false">
+      <layout_panel name="notifications_list_panel" width="100" user_resize="true">
+    <scroll_list draw_heading="true" left="0" bottom="0" width="100" height="78" follows="left|right|top|bottom" name="notifications_list" sort_column="2" sort_ascending="false">
      <column label="Name" name="name" width="100" user_resize="true"/>
      <column label="Content" name="content" width="150" user_resize="true" dynamicwidth="true"/>
      <column label="Date" name="date" width="150" user_resize="true"/>
    </scroll_list>
-    <scroll_list user_resize="true"  draw_heading="true" left="0" bottom="0" width="100" height="78" follows="left|right|top|bottom" name="notification_rejects_list" sort_column="2" sort_ascending="false">
+    </layout_panel>
+    <layout_panel name="rejects_list_panel" width="100" user_resize="true">
+    <scroll_list draw_heading="true" left="0" bottom="0" width="100" height="78" follows="left|right|top|bottom" name="notification_rejects_list" sort_column="2" sort_ascending="false">
      <column label="Name" name="name" width="100" user_resize="true"/>
      <column label="Content" name="content" width="150" user_resize="true" dynamicwidth="true"/>
      <column label="Date" name="date" width="150" user_resize="true"/>
    </scroll_list>
+    </layout_panel>
  </layout_stack>
  <button name="header" label="" image="rounded_square.tga" left="0" bottom="-20" width="100" height="20" follows="left|right|top" toggle="true"/>
 </panel>
--- a/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
@@ -64,11 +64,7 @@
 			<panel background_visible="false" border="false" bottom="0" name="voice_remote" />
 		</layout_panel>
 		<layout_panel auto_resize="false" bottom="0" mouse_opaque="false"
-		     name="AdvSettings_container" use_bounding_rect="true" user_resize="false" min_width="30" >
-			<panel background_visible="false" border="false" bottom="0" name="Adv_Settings" />
-		</layout_panel>
-		<layout_panel auto_resize="false" bottom="0" mouse_opaque="false"
-		     name="AdvSettings_container_exp" use_bounding_rect="true" user_resize="false" min_width="200" >
+		     name="AdvSettings_container" use_bounding_rect="true" user_resize="false" min_width="30" width="30" >
 			<panel background_visible="false" border="false" bottom="0" name="Adv_Settings" />
 		</layout_panel>
 	</layout_stack>
--- a/indra/newview/skins/default/xui/en-us/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_prim_media_controls.xml
@@ -0,0 +1,490 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel
+	follows="left|right|top|bottom"
+	name="MediaControls"
+	background_visible="false"
+	height="200"
+	mouse_opaque="false"
+	min_width="300"
+	width="800">
+  <string name="control_background_image_name">square_btn_32x128.tga</string>
+  <string name="skip_step">0.2</string>
+  <string name="min_width">300</string>
+  <string name="min_height">75</string>
+  <string name="zoom_near_padding">1.0</string>
+  <string name="zoom_medium_padding">1.1</string>
+  <string name="zoom_far_padding">1.5</string>
+  <string name="top_world_view_avoid_zone">50</string>
+
+  <layout_stack
+	  name="progress_indicator_area"
+	  follows="left|right|top"
+	  height="8"
+          animate="false"
+	  left="0"
+	  orientation="horizontal"
+	  bottom="-30">
+        <layout_panel
+		width="0"
+		name="left_bookend_bottom"
+		mouse_opaque="false"
+		user_resize="false"
+		/>
+        <layout_panel
+		name="media_progress_indicator"
+		mouse_opaque="false"
+		height="8"
+		user_resize="false"
+		left="0"
+		top="0"
+		auto_resize="false"
+		min_width="100"
+		width="200">
+	  <progress_bar
+		  name="media_progress_bar"
+		  color_bg="1 1 1 1"
+		  color_bar="1 1 1 0.96"
+		  follows="left|right|top"
+		  height="8"
+		  top="0"
+                  left="0"
+		  />
+	</layout_panel>
+	<layout_panel
+		name="right_bookend_bottom"
+		width="0"
+		mouse_opaque="false"
+		user_resize="false"
+		/>
+  </layout_stack>
+  <layout_stack
+	  name="media_controls"
+	  follows="left|right|top"
+	  animate="false"
+	  height="45"
+	  bottom="-45"
+	  left="0"
+	  border_size="0"
+	  mouse_opaque="true"
+	  orientation="horizontal">
+	<!-- outer layout_panels center the inner one -->
+	<layout_panel
+		name="left_bookend"
+		top="0"
+		width="0"
+		user_resize="false"
+		mouse_opaque="false"/>
+	<layout_panel
+		name="back"
+		user_resize="false"
+		auto_resize="false"
+		mouse_opaque="false"
+		min_width="22"
+		width="22">
+	  <button
+                  name="back_btn"
+                  follows="top"
+                  image_overlay="go-previous.png"
+                  auto_resize="false"
+                  label=""
+		  bottom="-22"
+                  left="0"
+		  width="22"
+		  height="22">
+		<button.commit_callback
+			function="MediaCtrl.Back" />
+	  </button>
+
+	</layout_panel>
+	<layout_panel
+		name="fwd"
+		user_resize="false"
+		mouse_opaque="false"
+		auto_resize="false"
+		min_width="22"
+		height="22"
+		width="22">
+          <button
+                  name="fwd_btn"
+                  follows="top"
+                  image_overlay="go-next.png"
+                  label=""
+		  bottom="-22"
+                  height="22"
+                  width="22">
+                <button.commit_callback
+                        function="MediaCtrl.Forward" />
+          </button>
+	</layout_panel>
+	<layout_panel
+		name="home"
+		user_resize="false"
+		mouse_opaque="false"
+		auto_resize="false"
+		top="0"
+		height="22"
+		min_width="22"
+		width="22">
+	  <button
+	          name="home_btn"
+		  follows="top"
+		  image_overlay="go-home.png"
+	          label=""
+		  bottom="-22"
+	          height="22"
+	          width="22">
+	        <button.commit_callback
+                        function="MediaCtrl.Home" />
+	  </button>
+	</layout_panel>
+	<layout_panel
+		name="media_stop"
+		mouse_opaque="false"
+		auto_resize="false"
+		user_resize="false"
+		top="0"
+		height="22"
+		min_width="22"
+		width="22">
+	  <button
+	          name="media_stop_btn"
+		  follows="top"
+	          image_overlay="go-media-stop.png"
+	          label=""
+		  bottom="-22"
+		  height="22"
+	          width="22">
+	        <button.commit_callback
+	                function="MediaCtrl.MediaStop" />
+	  </button>
+	</layout_panel>
+	<layout_panel
+		name="reload"
+		mouse_opaque="false"
+		auto_resize="false"
+		user_resize="false"
+		top="0"
+		height="22"
+		min_width="22"
+		width="22">
+	  <button
+		  name="reload_btn"
+		  follows="top"
+		  image_overlay="go-reload.png"
+		  label=""
+		  bottom="-22"
+		  height="22"
+		  width="22">
+		<button.commit_callback
+		        function="MediaCtrl.Reload" />
+	  </button>
+	</layout_panel>
+	<layout_panel
+		name="stop"
+		mouse_opaque="false"
+		auto_resize="false"
+		  user_resize="false"
+		top="0"
+		height="22"
+		min_width="22"
+		width="22">
+           <button
+		  name="stop_btn"
+		  follows="top"
+		  image_overlay="go-stop.png"
+		  label=""
+		  bottom="-22"
+                  height="22"
+                  width="22">
+		<button.commit_callback
+		        function="MediaCtrl.Stop" />
+           </button>
+	</layout_panel>
+	<layout_panel
+		name="play"
+		mouse_opaque="false"
+		auto_resize="false"
+		user_resize="false"
+		top="0"
+		height="22"
+		min_width="22"
+		width="22">
+	  <button
+		  name="play_btn"
+		  follows="top"
+		  image_overlay="go-media-play.png"
+		  label=""
+		  bottom="-22"
+		  height="22"
+		  width="22">
+		<button.commit_callback
+			function="MediaCtrl.Play" />
+	  </button>
+  	</layout_panel>
+	<layout_panel
+		name="pause"
+		mouse_opaque="false"
+		auto_resize="false"
+		user_resize="false"
+		top="0"
+		min_width="22"
+		width="22">
+	  <button
+		  name="pause_btn"
+		  follows="top"
+		  image_overlay="go-media-pause.png"
+		  label=""
+		  bottom="-22"
+		  height="22"
+		  width="22"
+		  tool_tip = "Pause media">
+		<button.commit_callback
+			function="MediaCtrl.Pause" />
+	  </button>
+	</layout_panel>
+	<!-- media URL entry  -->
+	<layout_panel
+		name="media_address"
+		mouse_opaque="false"
+		auto_resize="true"
+		height="24"
+		follows="left|right|bottom"
+		user_resize="false"
+		width="190"
+		min_width="90">
+	  <line_editor 
+		  name="media_address_url"
+		  max_length_bytes="1023"
+		  follows="top|left|right" 
+		  height="22"
+		  bottom="-22"
+		  text_pad_right="16"> 
+		<line_editor.commit_callback
+			function="MediaCtrl.CommitURL"/>
+	  </line_editor>
+	  <layout_stack
+		  name="media_address_url_icons"
+		  animate="false"
+		  follows="top|right"
+		  height="20"
+		  width="38"
+		  right="-1"
+		  border_size="0"
+		  mouse_opaque="false"
+		  orientation="horizontal">
+		<layout_panel
+			user_resize="false"
+			width="16"
+			mouse_opaque="false"
+			auto_resize="false">
+		  <icon
+			  name="media_whitelist_flag"
+			  follows="top|right"
+			  height="16"
+			  image_name="Flag"
+			  layout="topleft"
+			  bottom="-22"
+			  width="16" />
+		</layout_panel>
+		<layout_panel
+			user_resize="false"
+			width="16"
+			mouse_opaque="false"
+			auto_resize="false">
+		  <icon
+			  name="media_secure_lock_flag"
+			  height="16"
+			  image_name="lock.png"
+			  bottom="-22"
+			  width="16" />
+		</layout_panel>
+	  </layout_stack>
+	</layout_panel>
+	<layout_panel
+		name="media_play_position"
+		mouse_opaque="false"
+		auto_resize="true"
+		follows="left|right"
+		user_resize="false"
+		height="22"
+		min_width="100"
+		width="200">
+	  <slider_bar
+		  name="media_play_slider"
+		  follows="left|right|top"
+		  bottom="-22"
+		  height="22"
+		  increment="0.01"
+		  initial_value="0.5"
+		  width="200">
+		<slider_bar.commit_callback
+			function="MediaCtrl.JumpProgress" />
+	  </slider_bar>
+	</layout_panel>
+	<layout_panel
+		name="skip_back"
+		mouse_opaque="false"
+		auto_resize="false"
+		user_resize="false"
+		min_width="22"
+		width="22">
+	  <button
+		  name="skip_back_btn"
+		  follows="top"
+		  image_overlay="go-media-skip-backwards.png"
+		  label=""
+		  bottom="-22"
+		  auto_resize="false"
+		  height="22"
+		  width="22">
+		<button.commit_callback
+			function="MediaCtrl.SkipBack" />
+	  </button>
+	</layout_panel>
+	<layout_panel
+		name="skip_forward"
+		mouse_opaque="false"
+		auto_resize="false"
+		user_resize="false"
+		min_width="22"
+		width="22">
+	  <button
+		  name="skip_forward_btn"
+		  follows="top"
+		  image_overlay="go-media-skip-forward.png"
+		  label=""
+		  bottom="-22"
+		  height="22"
+		  width="22">
+		<button.commit_callback
+			function="MediaCtrl.SkipForward" />
+	  </button>
+
+	</layout_panel>
+	<layout_panel
+		name="media_volume"
+		mouse_opaque="false"
+		auto_resize="false"
+		user_resize="false"
+		height="72"
+		min_width="22"
+		width="32">
+	  <!-- Note: this is not quite right either...the mute button is not the -->
+	  <!-- same as the others because it cannot have the "image_overlay" be  -->
+	  <!-- two different images.  -->
+	  <!-- Note also: the button and the slider must overlap! -->
+	  <button
+		  name="media_mute_button"
+		  follows="top"
+		  label=""
+		  image_selected="icn_speaker-muted_dark.tga"
+		  image_unselected="icn_speaker_dark.tga"
+		  hover_glow_amount="0.15"
+		  is_toggle="true"
+		  scale_image="false"
+		  left_delta="5"
+		  bottom="-22"
+		  draw_border="true"
+		  height="20"
+		  width="22" >
+		<button.commit_callback
+			function="MediaCtrl.ToggleMute" />
+		<button.mouseenter_callback
+			function="MediaCtrl.ShowVolumeSlider" />
+		<button.mouseleave_callback
+			function="MediaCtrl.HideVolumeSlider" />
+	  </button>
+	  <slider
+		  orientation="vertical"
+		  left="-35"
+		  height="20"
+		  bottom="-42"
+		  increment="0.01"
+		  initial_value="0.5"
+		  name="volume_slider"
+		  tool_tip="Media Volume"
+		  show_text="false"
+		  width="40"
+		  volume="true">
+		<slider.commit_callback
+			function="MediaCtrl.Volume"/>
+		<slider.mouseenter_callback
+			function="MediaCtrl.ShowVolumeSlider" />
+		<slider.mouseleave_callback
+			function="MediaCtrl.HideVolumeSlider" />
+	  </slider>
+	</layout_panel>
+	<layout_panel
+		name="zoom_frame"
+		mouse_opaque="false"
+		auto_resize="false"
+		user_resize="false"
+		height="28"
+		min_width="22"
+		width="22">
+	  <button
+		  name="zoom_frame_btn"
+		  follows="top"
+		  image_overlay="go-media-zoom.png"
+		  label=""
+		  bottom="-22"
+		  height="22"
+		  width="22">
+		<button.commit_callback
+			function="MediaCtrl.Zoom" />
+	  </button>
+	</layout_panel>
+	<layout_panel
+		name="close"
+		mouse_opaque="false"
+		auto_resize="false"
+		user_resize="false"
+		top="0"
+		min_width="21"
+		width="21" >
+	   <button
+		  name="close_btn"
+		  follows="top"
+		  image_overlay="go-media-unzoom.png"
+		  label=""
+		  height="22"
+		  bottom="-22"
+		  width="21">
+		<button.commit_callback
+			function="MediaCtrl.Close" />
+	  </button>
+	</layout_panel>
+	<layout_panel
+		name="new_window"
+		mouse_opaque="false"
+		auto_resize="false"
+		user_resize="false"
+		min_width="22"
+		width="22">
+	  <button
+		  name="new_window_btn"
+		  follows="top"
+		  image_overlay="media_btn_newwindow.png"
+		  label=""
+		  bottom="-22"
+		  height="22"
+		  width="24" >
+		<button.commit_callback
+			function="MediaCtrl.Open" />
+	  </button>
+	</layout_panel>
+	<!-- bookend panel -->
+	<layout_panel
+		name="right_bookend"
+		mouse_opaque="false"
+		user_resize="false"
+		width="0"/>
+		
+  </layout_stack>
+  <panel
+	  name="media_region"
+	  height="100"
+	  follows="left|right|top|bottom"
+	  mouse_opaque="false"
+	  bottom="10" />
+</panel>
--- a/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
@@ -2,19 +2,45 @@
 <panel background_opaque="true" background_visible="true" bottom="0" can_close="true" can_minimize="false" can_resize="false" follows="left|right|bottom" height="28" name="toolbar" width="1024">    
  <string name="Redock Windows">Redock Windows</string>
  <panel bottom="0" filename="panel_bg_toolbar.xml" height="28" left="0" width="1024"/>
-  <layout_stack name="toolbar_stack" follows="left|right|bottom|top" bottom="2" left="1" width="1022" height="26" min_width="200" min_height="26"  orientation="horizontal" border_size="0">
-    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" left="0" />
-    <button bottom="0" height="24" image_selected="btn_chatbar_selected.tga" scale_image="true" image_unselected="btn_chatbar.tga" label="" left="2" name="chat_btn" image_overlay="icn_chatbar.tga" tool_tip="Show Chat Bar. (Enter)" width="50" auto_resize="false" follows="left|right" user_resize="false"/>
-    <icon image_name="spacer24.tga" left_delta="2" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0"/>
-    <flyout_button bottom="0" font="SansSerif" height="24" label="Communicate" left="0" name="communicate_btn" tool_tip="Communicate with your Friends and Groups.(Ctrl-T)" list_position="above" width="50" follows="left|right" user_resize="false"/>
-    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0"/>
-    <button bottom="0" height="24" label="Radar" image_overlay="icn_toolbar_radar.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" label_selected="Radar" name="radar_list_btn" tool_tip="View a list of nearby avatars.(Ctrl-Shift-A)" width="50" follows="left|right" user_resize="false"/>
-	<button bottom="0" height="24" label="Fly" image_overlay="icn_toolbar_fly.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" label_selected="Stop Flying" name="fly_btn" tool_tip="Start flying(F or Home). Use E/C or PgUp/PgDn to fly up and down." width="50" follows="left|right" user_resize="false"/>
-	<button bottom="0" height="24" label="Snapshot" image_overlay="icn_toolbar_snapshot.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="snapshot_btn" tool_tip="Save a screen shot to disk or inventory.(Ctrl-Shift-S for floater, Ctrl-`(~) takes snapshot w/o floater)" width="50" follows="left|right" user_resize="false"/>
-    <button bottom="0" height="24" label="Search" image_overlay="icn_toolbar_search.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="directory_btn" tool_tip="Search for places, events, people, and more.(Ctrl-F)" width="50" follows="left|right" user_resize="false"/>
-    <button bottom="0" height="24" label="Build" name="build_btn" image_overlay="icn_toolbar_build.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" tool_tip="Create new objects. (B)" width="50" follows="left|right" user_resize="false"/>
-    <button bottom="0" height="24" label="Map" name="map_btn" image_overlay="icn_toolbar_map.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" tool_tip="Map of the world. (Ctrl-M)" width="50" follows="left|right" user_resize="false"/>
-    <button bottom="0" height="24" label="Mini-Map" image_overlay="icn_toolbar_minimap.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="radar_btn" tool_tip="Map of the area around you. (Ctrl-Shift-M)" width="50" follows="left|right" user_resize="false"/>
-    <button bottom="0" height="24" label="Inventory" image_overlay="icn_toolbar_inventory.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="inventory_btn" tool_tip="Your items. (Ctrl-I)" width="50" follows="left|right" user_resize="false"/>
+  <layout_stack name="toolbar_stack" follows="left|right|bottom|top" bottom="2" left="1" width="1022" height="26" min_width="200" orientation="horizontal" border_size="0">
+	  <layout_panel name="panel1" height="2" width="2" auto_resize="false" user_resize="false">
+		  <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" color="0,0,0,0" left="0" />
+	  </layout_panel>
+    <layout_panel name="panel2" height="24" width="50" auto_resize="false" user_resize="false">
+		  <button bottom="0" height="24" image_selected="btn_chatbar_selected.tga" scale_image="true" image_unselected="btn_chatbar.tga" label="" left="2" name="chat_btn" image_overlay="icn_chatbar.tga" tool_tip="Show Chat Bar. (Enter)" width="50" follows="left|right" />
+	  </layout_panel>
+	  <layout_panel name="panel3" height="2" width="2" auto_resize="false" user_resize="false">
+		  <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" color="0,0,0,0"/>
+	  </layout_panel>
+	  <layout_panel name="panel4" height="24" width="50" user_resize="false">
+		  <flyout_button bottom="0" font="SansSerif" height="24" label="Communicate" left="0" name="communicate_btn" tool_tip="Communicate with your Friends and Groups.(Ctrl-T)" list_position="above" width="50" follows="left|right"/>
+	  </layout_panel>
+	  <layout_panel name="panel5" height="2" width="2" auto_resize="false" user_resize="false">
+		  <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0"/>
+	  </layout_panel>
+	  <layout_panel name="panel6" height="24" width="50" user_resize="false">
+		  <button bottom="0" height="24" label="Radar" image_overlay="icn_toolbar_radar.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" label_selected="Radar" name="radar_list_btn" tool_tip="View a list of nearby avatars.(Ctrl-Shift-A)" width="50" follows="left|right"/>
+	  </layout_panel>
+	  <layout_panel name="panel7" height="24" width="50" user_resize="false">
+		  <button bottom="0" height="24" label="Fly" image_overlay="icn_toolbar_fly.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" label_selected="Stop Flying" name="fly_btn" tool_tip="Start flying(F or Home). Use E/C or PgUp/PgDn to fly up and down." width="50" follows="left|right"/>
+	  </layout_panel>
+	  <layout_panel name="panel8" height="24" width="50" user_resize="false">
+		  <button bottom="0" height="24" label="Snapshot" image_overlay="icn_toolbar_snapshot.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="snapshot_btn" tool_tip="Save a screen shot to disk or inventory.(Ctrl-Shift-S for floater, Ctrl-`(~) takes snapshot w/o floater)" width="50" follows="left|right"/>
+	  </layout_panel>
+	  <layout_panel name="panel9" height="24" width="50" user_resize="false">
+		  <button bottom="0" height="24" label="Search" image_overlay="icn_toolbar_search.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="directory_btn" tool_tip="Search for places, events, people, and more.(Ctrl-F)" width="50" follows="left|right"/>
+	  </layout_panel>
+	  <layout_panel name="panel10" height="24" width="50" user_resize="false">
+		  <button bottom="0" height="24" label="Build" name="build_btn" image_overlay="icn_toolbar_build.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" tool_tip="Create new objects. (B)" width="50" follows="left|right"/>
+	  </layout_panel>
+	  <layout_panel name="panel11" height="24" width="50" user_resize="false">
+		  <button bottom="0" height="24" label="Map" name="map_btn" image_overlay="icn_toolbar_map.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" tool_tip="Map of the world. (Ctrl-M)" width="50" follows="left|right"/>
+	  </layout_panel>
+	  <layout_panel name="panel12" height="24" width="50" user_resize="false">
+		  <button bottom="0" height="24" label="Mini-Map" image_overlay="icn_toolbar_minimap.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="radar_btn" tool_tip="Map of the area around you. (Ctrl-Shift-M)" width="50" follows="left|right"/>
+	  </layout_panel>
+	  <layout_panel name="panel13" height="24" width="50" user_resize="false">
+		  <button bottom="0" height="24" label="Inventory" image_overlay="icn_toolbar_inventory.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="inventory_btn" tool_tip="Your items. (Ctrl-I)" width="50" follows="left|right"/>
+	  </layout_panel>
  </layout_stack>
 </panel>
--- a/indra/newview/skins/default/xui/es/panel_notifications_channel.xml
+++ b/indra/newview/skins/default/xui/es/panel_notifications_channel.xml
@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="notifications_panel">
  <layout_stack name="stack1">
+  	<layout_panel name="notifications_list_panel">
 		<scroll_list name="notifications_list">
 			<column label="Nombre" name="name"/>
 			<column label="Contenido" name="content"/>
 			<column label="Fecha" name="date"/>
 		</scroll_list>
+	</layout_panel>
+	<layout_panel name="rejects_list_panel">
 		<scroll_list name="notification_rejects_list">
 			<column label="Nombre" name="name"/>
 			<column label="Contenido" name="content"/>
 			<column label="Fecha" name="date"/>
 		</scroll_list>
-	</layout_stack>
-	<button name="header" label="" />
+	</layout_panel>
+  </layout_stack>
+
+  <button name="header" label="" />
 </panel>
--- a/indra/newview/skins/default/xui/es/panel_overlaybar.xml
+++ b/indra/newview/skins/default/xui/es/panel_overlaybar.xml
@@ -24,10 +24,7 @@
 		<layout_panel name="voice_remote_container">
 			<panel name="voice_remote"/>
 		</layout_panel>
-		<layout_panel name="AdvSettings_container">
-			<panel name="Adv_Settings"/>
-		</layout_panel>
-		<layout_panel name="AdvSettings_container_exp" min_width="230">
+		<layout_panel name="AdvSettings_container" expanded_min_dim="230">
 			<panel name="Adv_Settings"/>
 		</layout_panel>
 	</layout_stack>
--- a/indra/newview/skins/default/xui/es/panel_toolbar.xml
+++ b/indra/newview/skins/default/xui/es/panel_toolbar.xml
@@ -3,17 +3,36 @@
 	<string name="Redock Windows">
 		Reacoplar Ventana
 	</string>
-	<panel filename="panel_bg_toolbar.xml"/>
 	<layout_stack name="toolbar_stack" >
-		<button label="" name="chat_btn" tool_tip="Mostrar Barra de Chat. (Intro)"/>
-		<flyout_button label="Comunicación" name="communicate_btn" tool_tip="Comunícate con tus amigos o grupos.(Ctrl-T)" />
-		<button label="Radar" name="radar_list_btn" tool_tip="Ver lista de avatares cercanos.(Ctrl-Shift-A)"/>
-		<button label="Volar" label_selected="Stop Flying" name="fly_btn" tool_tip="Despegar(F o Inicio). Usa E/C o AvPáa/RePág para ascender o descender"/>
-		<button label="Foto" name="snapshot_btn" tool_tip="Guardar una captura de pantalla al disco o al inventario.(Ctrl-Shift-S para abrir el flotante, Ctrl-`(~) toma la captura sin el flotante)"/>
-		<button label="Buscar" name="directory_btn" tool_tip="Buscar lugares, eventos, personas, y más.(Ctrl-F)"/>
-		<button label="Construir" name="build_btn" tool_tip="Crear nuevos objetos. (B)"/>
-		<button label="Mapa" name="map_btn" tool_tip="Mapa del Mundo. (Ctrl-M)"/>
-		<button label="MiniMapa" name="radar_btn" tool_tip="Mapa del área a tu alrededor. (Ctrl-Shift-M)"/>
-		<button label="Inventario" name="inventory_btn" tool_tip="Tus items. (Ctrl-I)"/>
+    <layout_panel name="panel2">
+		  <button label="" name="chat_btn" tool_tip="Mostrar Barra de Chat. (Intro)"/>
+    </layout_panel>
+    <layout_panel name="panel4">
+		  <flyout_button label="Comunicación" name="communicate_btn" tool_tip="Comunícate con tus amigos o grupos.(Ctrl-T)" />
+    </layout_panel>
+    <layout_panel name="panel6">
+		  <button label="Radar" name="radar_list_btn" tool_tip="Ver lista de avatares cercanos.(Ctrl-Shift-A)"/>
+    </layout_panel>
+    <layout_panel name="panel7">
+		  <button label="Volar" label_selected="Stop Flying" name="fly_btn" tool_tip="Despegar(F o Inicio). Usa E/C o AvPáa/RePág para ascender o descender"/>
+    </layout_panel>
+    <layout_panel name="panel8">
+		  <button label="Foto" name="snapshot_btn" tool_tip="Guardar una captura de pantalla al disco o al inventario.(Ctrl-Shift-S para abrir el flotante, Ctrl-`(~) toma la captura sin el flotante)"/>
+    </layout_panel>
+    <layout_panel name="panel9">
+		  <button label="Buscar" name="directory_btn" tool_tip="Buscar lugares, eventos, personas, y más.(Ctrl-F)"/>
+    </layout_panel>
+    <layout_panel name="panel10">
+		  <button label="Construir" name="build_btn" tool_tip="Crear nuevos objetos. (B)"/>
+    </layout_panel>
+    <layout_panel name="panel11">
+		  <button label="Mapa" name="map_btn" tool_tip="Mapa del Mundo. (Ctrl-M)"/>
+    </layout_panel>
+    <layout_panel name="panel12">
+		  <button label="MiniMapa" name="radar_btn" tool_tip="Mapa del área a tu alrededor. (Ctrl-Shift-M)"/>
+    </layout_panel>
+    <layout_panel name="panel13">
+		  <button label="Inventario" name="inventory_btn" tool_tip="Tus items. (Ctrl-I)"/>
+    </layout_panel>
 	</layout_stack>
 </panel>
--- a/indra/newview/skins/default/xui/fr/panel_notifications_channel.xml
+++ b/indra/newview/skins/default/xui/fr/panel_notifications_channel.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="notifications_panel">
 	<layout_stack name="stack1">
+	     <layout_panel name="notifications_list_panel" >
 		<scroll_list name="notifications_list">
 			<column label="Nom" name="name"/>
 			<column label="Contenu" name="content"/>
 			<column label="Date" name="date"/>
-		</scroll_list>
-		<scroll_list name="notification_rejects_list">
-			<column label="Nom" name="name"/>
-			<column label="Contenu" name="content"/>
-			<column label="Date" name="date"/>
-		</scroll_list>
+			</scroll_list>
+		</layout_panel>
+	     <layout_panel name="rejects_list_panel" >
+			<scroll_list name="notification_rejects_list">
+				<column label="Nom" name="name"/>
+				<column label="Contenu" name="content"/>
+				<column label="Date" name="date"/>
+			</scroll_list>
+		</layout_panel>
 	</layout_stack>
 </panel>
--- a/indra/newview/skins/default/xui/fr/panel_toolbar.xml
+++ b/indra/newview/skins/default/xui/fr/panel_toolbar.xml
@@ -4,14 +4,32 @@
 		Rétablir les fenêtres
 	</string>
 	<layout_stack name="toolbar_stack">
-		<button label="" name="chat_btn" tool_tip="Affiche la barre de chat.(Entrée)"/>
-		<flyout_button label="Communiquer" name="communicate_btn" tool_tip="Communiquez (valable pour les amis et groupes."/>
-		<button label="Voler" label_selected="Atterrir" name="fly_btn" tool_tip="Commencez à voler. Utilisez E/C ou PgHaut/PgBas pour voler vers le haut et vers le bas."/>
-		<button label="Photo" name="snapshot_btn" tool_tip="Enregistrez une photo sur le disque ou dans l&apos;inventaire."/>
-		<button label="Rechercher" name="directory_btn" tool_tip="Recherchez des endroits, des événements, des résidents et plus encore."/>
-		<button label="Construire" name="build_btn" tool_tip="Créez de nouveaux objets."/>
-		<button label="Mini-carte" name="radar_btn" tool_tip="Affichez la carte de la zone locale. (Ctrl-Maj-M)"/>
-		<button label="Carte" name="map_btn" tool_tip="Affichez la carte du Monde. (Ctrl-M)"/>
-		<button label="Inventaire" name="inventory_btn" tool_tip="Vos objets (Ctrl-I)"/>
+    <layout_panel name="panel2">
+      <button label="" name="chat_btn" tool_tip="Affiche la barre de chat.(Entrée)"/>
+    </layout_panel>
+    <layout_panel name="panel4">
+      <flyout_button label="Communiquer" name="communicate_btn" tool_tip="Communiquez (valable pour les amis et groupes."/>
+    </layout_panel>
+    <layout_panel name="panel7">
+      <button label="Voler" label_selected="Atterrir" name="fly_btn" tool_tip="Commencez à voler. Utilisez E/C ou PgHaut/PgBas pour voler vers le haut et vers le bas."/>
+    </layout_panel>
+    <layout_panel name="panel8">
+      <button label="Photo" name="snapshot_btn" tool_tip="Enregistrez une photo sur le disque ou dans l&apos;inventaire."/>
+    </layout_panel>
+    <layout_panel name="panel9">
+      <button label="Rechercher" name="directory_btn" tool_tip="Recherchez des endroits, des événements, des résidents et plus encore."/>
+    </layout_panel>
+    <layout_panel name="panel10">
+      <button label="Construire" name="build_btn" tool_tip="Créez de nouveaux objets."/>
+    </layout_panel>
+    <layout_panel name="panel11">
+      <button label="Carte" name="map_btn" tool_tip="Affichez la carte du Monde. (Ctrl-M)"/>
+    </layout_panel>
+    <layout_panel name="panel12">
+      <button label="Mini-carte" name="radar_btn" tool_tip="Affichez la carte de la zone locale. (Ctrl-Maj-M)"/>
+    </layout_panel>
+    <layout_panel name="panel13">
+      <button label="Inventaire" name="inventory_btn" tool_tip="Vos objets (Ctrl-I)"/>
+    </layout_panel>
 	</layout_stack>
 </panel>
--- a/indra/newview/skins/default/xui/pt/panel_toolbar.xml
+++ b/indra/newview/skins/default/xui/pt/panel_toolbar.xml
@@ -4,14 +4,32 @@
 		Reagrupar as janelas
 	</string>
 	<layout_stack name="toolbar_stack">
-		<button label="" name="chat_btn" tool_tip="Mostrar a barra de Conversa por Texto. (Enter)"/>
-		<flyout_button label="Comunicar-se" name="communicate_btn" tool_tip="Comunicar-se com seus Amigos e Grupos."/>
-		<button label="Voar" label_selected="Parar de voar." name="fly_btn" tool_tip="Começar a voar. Use E/C ou  PgUp/PgDn  para voar para cima e para baixo."/>
-		<button label="Foto" name="snapshot_btn" tool_tip="Salvar uma foto da tela no disco ou no inventário."/>
-		<button label="Busca" name="directory_btn" tool_tip="Busca a lugares, eventos, pessoas e mais."/>
-		<button label="Construir" name="build_btn" tool_tip="Criar novos objetos."/>
-		<button label="Mapa" name="map_btn" tool_tip="Mapa do Mundo. (Ctrl-M)"/>
-		<button label="Mini-Mapa" name="radar_btn" tool_tip="Mapa da área ao seu redor. (Ctrl-Shift-M)"/>
-		<button label="Inventário" name="inventory_btn" tool_tip="Seus itens. (Ctrl-I)"/>
+    <layout_panel name="panel2">
+      <button label="" name="chat_btn" tool_tip="Mostrar a barra de Conversa por Texto. (Enter)"/>
+    </layout_panel>
+    <layout_panel name="panel4">
+      <flyout_button label="Comunicar-se" name="communicate_btn" tool_tip="Comunicar-se com seus Amigos e Grupos."/>
+    </layout_panel>
+    <layout_panel name="panel7">
+      <button label="Voar" label_selected="Parar de voar." name="fly_btn" tool_tip="Começar a voar. Use E/C ou  PgUp/PgDn  para voar para cima e para baixo."/>
+    </layout_panel>
+    <layout_panel name="panel8">
+      <button label="Foto" name="snapshot_btn" tool_tip="Salvar uma foto da tela no disco ou no inventário."/>
+    </layout_panel>
+    <layout_panel name="panel9">
+      <button label="Busca" name="directory_btn" tool_tip="Busca a lugares, eventos, pessoas e mais."/>
+    </layout_panel>
+    <layout_panel name="panel10">
+      <button label="Construir" name="build_btn" tool_tip="Criar novos objetos."/>
+    </layout_panel>
+    <layout_panel name="panel11">
+      <button label="Mapa" name="map_btn" tool_tip="Mapa do Mundo. (Ctrl-M)"/>
+    </layout_panel>
+    <layout_panel name="panel12">
+      <button label="Mini-Mapa" name="radar_btn" tool_tip="Mapa da área ao seu redor. (Ctrl-Shift-M)"/>
+    </layout_panel>
+    <layout_panel name="panel13">
+      <button label="Inventário" name="inventory_btn" tool_tip="Seus itens. (Ctrl-I)"/>
+    </layout_panel>
 	</layout_stack>
 </panel>
--- a/indra/newview/wlfPanel_AdvSettings.cpp
+++ b/indra/newview/wlfPanel_AdvSettings.cpp
@@ -57,17 +57,23 @@
 #include "rlvhandler.h"
 // [/RLVa:KB]

-BOOL firstBuildDone;
-void* fixPointer;
-
-wlfPanel_AdvSettings::wlfPanel_AdvSettings()
+wlfPanel_AdvSettings::wlfPanel_AdvSettings() : mBuilt(false)
 {
 	setIsChrome(TRUE);
 	setFocusRoot(TRUE);
-	build();
 }
+
+//static
+void wlfPanel_AdvSettings::updateClass()
+{
+	if(!wlfPanel_AdvSettings::instanceExists())
+		return;
+	wlfPanel_AdvSettings::getInstance()->build(); 
+}
+
 void wlfPanel_AdvSettings::build()
 {
+
 	deleteAllChildren();
 	std::string ButtonState;
 	if (!gSavedSettings.getBOOL("wlfAdvSettingsPopup"))
@@ -131,16 +137,6 @@ void wlfPanel_AdvSettings::refreshLists()
 	updateTimeSlider();
 }

-void wlfPanel_AdvSettings::fixPanel()
-{
-	if(!firstBuildDone)
-	{
-		llinfos << "firstbuild done" << llendl;
-		firstBuildDone = TRUE;
-		onClickExpandBtn(fixPointer);
-	}
-}
-
 BOOL wlfPanel_AdvSettings::postBuild()
 {
 	childSetAction("expand", onClickExpandBtn, this);
@@ -180,8 +176,6 @@ BOOL wlfPanel_AdvSettings::postBuild()
 		mTimeSlider->setCommitCallback(onChangeDayTime);
 		updateTimeSlider();
 	}
-	
-	fixPointer = this;
 	return TRUE;
 }

@@ -198,9 +192,6 @@ wlfPanel_AdvSettings::~wlfPanel_AdvSettings ()
 void wlfPanel_AdvSettings::onClickExpandBtn(void* user_data)
 {
 	gSavedSettings.setBOOL("wlfAdvSettingsPopup",!gSavedSettings.getBOOL("wlfAdvSettingsPopup"));
-	wlfPanel_AdvSettings* remotep = (wlfPanel_AdvSettings*)user_data;
-	remotep->build();
-	gOverlayBar->layoutButtons();
 }

 void wlfPanel_AdvSettings::onUseRegionSettings(LLUICtrl* ctrl, void* userdata)
--- a/indra/newview/wlfPanel_AdvSettings.h
+++ b/indra/newview/wlfPanel_AdvSettings.h
@@ -37,7 +37,7 @@
 class LLComboBox;
 class LLSliderCtrl;

-class wlfPanel_AdvSettings : public LLPanel
+class wlfPanel_AdvSettings : public LLPanel, public LLSingleton<wlfPanel_AdvSettings>
 {
 public:
 	wlfPanel_AdvSettings ();
@@ -46,7 +46,7 @@ public:
 	BOOL postBuild();
 	void draw();
 	void refresh();
-	static void fixPanel();
+	static void updateClass();

 	static void onClickExpandBtn(void* user_data);
 	static void onChangeWWPresetName(LLUICtrl* ctrl, void* userData);
@@ -75,6 +75,8 @@ protected:
 	LLComboBox*		mSkyPresetCombo;
 	// LLComboBox*		mDayCyclePresetCombo;
 	LLSliderCtrl*		mTimeSlider;
+
+	bool mBuilt;
 };

 #endif // LL_wlfPanel_AdvSettings_H