diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index d7ce62765..ededd2462 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -8802,6 +8802,17 @@ This should be as low as possible, but too low may break functionality</string>
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>LastMediaSettingsTab</key>
+    <map>
+      <key>Comment</key>
+      <string>Last selected tab in media settings window</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>LastRunVersion</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/hippopanelgrids.cpp b/indra/newview/hippopanelgrids.cpp
index 6af943c5b..c5fe98de2 100644
--- a/indra/newview/hippopanelgrids.cpp
+++ b/indra/newview/hippopanelgrids.cpp
@@ -164,7 +164,7 @@ BOOL HippoPanelGridsImpl::postBuild()
 // called internally too
 void HippoPanelGridsImpl::refresh()
 {
-	const std::string &defaultGrid = gHippoGridManager->getDefaultGridNick();
+	const std::string &defaultGrid = gHippoGridManager->getDefaultGridName();
 
 	LLComboBox *grids = getChild<LLComboBox>("grid_selector");
 	S32 selectIndex = -1, i = 0;
@@ -365,7 +365,7 @@ bool HippoPanelGridsImpl::saveCurGrid()
 void HippoPanelGridsImpl::reset()
 {
 	mState = NORMAL;
-	mCurGrid = gHippoGridManager->getCurrentGridNick();
+	mCurGrid = gHippoGridManager->getCurrentGridName();
 	loadCurGrid();
 }
 
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index 1bbb0416b..e6fed8486 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -810,14 +810,14 @@ void LLPanelLogin::updateGridCombo()
 		std::string grid = it->second->getGridName();
 		if(grid.empty() || it->second == defGrid || it->second == curGrid)
 			continue;
-		grids->add(grid,it->second->getGridNick());
+		grids->add(grid);
 	}
 	if(curGrid || defGrid)
 	{
 		if(defGrid)
-			grids->add(defGrid->getGridName(),defGrid->getGridNick(),ADD_TOP);
+			grids->add(defGrid->getGridName(),ADD_TOP);
 		if(curGrid && defGrid != curGrid)
-			grids->add(curGrid->getGridName(),curGrid->getGridNick(),ADD_TOP);
+			grids->add(curGrid->getGridName(),ADD_TOP);
 		grids->setCurrentByIndex(0);
 	}
 	else
diff --git a/indra/newview/llpanelnearbymedia.cpp b/indra/newview/llpanelnearbymedia.cpp
index 0c7d3990d..9438dfa79 100644
--- a/indra/newview/llpanelnearbymedia.cpp
+++ b/indra/newview/llpanelnearbymedia.cpp
@@ -478,7 +478,7 @@ void LLPanelNearByMedia::updateListItem(LLScrollListItem* item,
 		
 		// *TODO: Make these font styles/colors configurable via XUI
 		U8 font_style = LLFontGL::NORMAL;
-		LLColor4 cell_color = LLColor4::black;
+		LLColor4 cell_color = LLUI::sColorsGroup->getColor("DefaultListText");
 		
 		// Only colorize by class in debug
 		if (mDebugInfoVisible)
@@ -503,7 +503,7 @@ void LLPanelNearByMedia::updateListItem(LLScrollListItem* item,
 			if (mDebugInfoVisible)
 			{
 				font_style |= LLFontGL::ITALIC;
-				cell_color = LLColor4::black;
+				cell_color = LLUI::sColorsGroup->getColor("DefaultListText");
 			}
 			else {
 				// Dim it if it is disabled
@@ -973,7 +973,7 @@ void LLPanelNearByMedia::onAdvancedButtonClick()
 		LLTabContainer* tabcontainer = prefsfloater->getChild<LLTabContainer>("pref core");
 		if (tabcontainer)
 		{
-			tabcontainer->selectTabByName("Media Panel");
+			tabcontainer->selectTabByName("Media panel");
 		}
 	}
 }
@@ -984,7 +984,8 @@ void LLPanelNearByMedia::onMoreLess()
 	mNearbyMediaPanel->setVisible(is_more);
 
 	// enable resizing when expanded
-	getChildView("resizebar_bottom")->setEnabled(is_more);
+	if(mStandalonePanel)
+		getChildView("resizebar_bottom")->setEnabled(is_more);
 
 	LLRect new_rect = is_more ? mMoreRect : mLessRect;
 	new_rect.translate(getRect().mRight - new_rect.mRight, getRect().mTop - new_rect.mTop);
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index 12aea19c1..5935942b6 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -325,7 +325,7 @@ public:
 	/*virtual*/ S32     setTEGlow(const U8 te, const F32 glow);
 	/*virtual*/	BOOL	setMaterial(const U8 material);
 	virtual		void	setTEImage(const U8 te, LLViewerTexture *imagep); // Not derived from LLPrimitive
-	void                changeTEImage(S32 index, LLViewerTexture* new_image)  ;
+	virtual     void	changeTEImage(S32 index, LLViewerTexture* new_image)  ;
 	LLViewerTexture		*getTEImage(const U8 te) const;
 	
 	void fitFaceTexture(const U8 face);
diff --git a/indra/newview/skins/default/textures/Parcel_Exp_Color.png b/indra/newview/skins/default/textures/Parcel_Exp_Color.png
new file mode 100644
index 000000000..4813d3719
Binary files /dev/null and b/indra/newview/skins/default/textures/Parcel_Exp_Color.png differ
diff --git a/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml b/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
index a10f0b74a..c9687b8c6 100644
--- a/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel follows="left|right|bottom|top" height="200" left="-1" mouse_opaque="false"
-     name="overlay" use_bounding_rect="true" width="728">
+     user_resize="false" name="overlay" use_bounding_rect="true" width="728">
 	<layout_stack bottom="0" follows="left|right|bottom" height="200" left="0"
 	     mouse_opaque="false" name="overlay_layout_panel" orientation="horizontal"
 	     right="-1" use_bounding_rect="true">
@@ -44,7 +44,7 @@
         </layout_panel>
 				<layout_panel auto_resize="false" background_visible="false" border="false" bottom="0"
 				     filename="panel_chat_bar.xml" follows="left|right|bottom" left="0"
-				     min_height="24" mouse_opaque="false" name="chat_bar"
+				     min_height="24" mouse_opaque="false" name="chat_bar" user_resize="false"
 				     use_bounding_rect="true" width="395" />
 			</layout_stack>
 		</layout_panel>
diff --git a/indra/newview/skins/default/xui/es/panel_nearby_media.xml b/indra/newview/skins/default/xui/es/panel_nearby_media.xml
index 8d4f9eda1..ba1cc48b0 100644
--- a/indra/newview/skins/default/xui/es/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/es/panel_nearby_media.xml
@@ -30,17 +30,17 @@
 			Mostrar:
 		</text>
 		<combo_box name="show_combo">
-			<combo_box.item label="Todo" name="All"/>
-			<combo_box.item label="En esta parcela" name="WithinParcel"/>
-			<combo_box.item label="Fuera de la parcela" name="OutsideParcel"/>
-			<combo_box.item label="En otros avatares" name="OnOthers"/>
+			<combo_item name="All">Todo</combo_box>
+			<combo_item name="WithinParcel>En esta parcela</combo_box>
+			<combo_item name="OutsideParcel">Fuera de la parcela</combo_box>
+			<combo_item name="OnOthers">En otros avatares</combo_box>
 		</combo_box>
 		<scroll_list name="media_list">
-			<scroll_list.columns label="Cercanía" name="media_proximity"/>
-			<scroll_list.columns label="Visibilidad" name="media_visibility"/>
-			<scroll_list.columns label="Clase" name="media_class"/>
-			<scroll_list.columns label="Nombre" name="media_name"/>
-			<scroll_list.columns label="Depurar" name="media_debug"/>
+			<column label="Cercanía" name="media_proximity"/>
+			<column label="Visibilidad" name="media_visibility"/>
+			<column label="Clase" name="media_class"/>
+			<column label="Nombre" name="media_name"/>
+			<column label="Depurar" name="media_debug"/>
 		</scroll_list>
 		<panel name="media_controls_panel">
 			<layout_stack name="media_controls">
diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml
index 7b7b67041..010f24a60 100644
--- a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml
@@ -30,17 +30,17 @@
 			Voir :
 		</text>
 		<combo_box name="show_combo">
-			<combo_box.item label="Tout" name="All"/>
-			<combo_box.item label="Sur cette parcelle" name="WithinParcel"/>
-			<combo_box.item label="En dehors de la parcelle" name="OutsideParcel"/>
-			<combo_box.item label="Sur les autres avatars" name="OnOthers"/>
+			<combo_item name="All">Tout</combo_item>
+			<combo_item name="WithinParcel">Sur cette parcelle</combo_item>
+			<combo_item name="OutsideParcel">En dehors de la parcelle</combo_item>
+			<combo_item name="OnOthers">Sur les autres avatars</combo_item>
 		</combo_box>
 		<scroll_list name="media_list">
-			<scroll_list.columns label="Proximité" name="media_proximity"/>
-			<scroll_list.columns label="Visible" name="media_visibility"/>
-			<scroll_list.columns label="Classe" name="media_class"/>
-			<scroll_list.columns label="Nom" name="media_name"/>
-			<scroll_list.columns label="Débogage" name="media_debug"/>
+			<column label="Proximité" name="media_proximity"/>
+			<column label="Visible" name="media_visibility"/>
+			<column label="Classe" name="media_class"/>
+			<column label="Nom" name="media_name"/>
+			<column label="Débogage" name="media_debug"/>
 		</scroll_list>
 		<panel name="media_controls_panel">
 			<layout_stack name="media_controls">
diff --git a/indra/newview/skins/default/xui/pt/panel_nearby_media.xml b/indra/newview/skins/default/xui/pt/panel_nearby_media.xml
index 43bf8f966..4eb292960 100644
--- a/indra/newview/skins/default/xui/pt/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/pt/panel_nearby_media.xml
@@ -30,17 +30,17 @@
 			Mostrar:
 		</text>
 		<combo_box name="show_combo">
-			<combo_box.item label="Tudo" name="All"/>
-			<combo_box.item label="Neste lote" name="WithinParcel"/>
-			<combo_box.item label="Fora deste lote" name="OutsideParcel"/>
-			<combo_box.item label="Nos outros avatares" name="OnOthers"/>
+			<combo_item name="All">Tudo</combo_item>
+			<combo_item name="WithinParcel">Neste lote</combo_item>
+			<combo_item name="OutsideParcel">Fora deste lote</combo_item>
+			<combo_item name="OnOthers">Nos outros avatares</combo_item>
 		</combo_box>
 		<scroll_list name="media_list">
-			<scroll_list.columns label="Proximidade" name="media_proximity"/>
-			<scroll_list.columns label="Visíveis" name="media_visibility"/>
-			<scroll_list.columns label="Classe" name="media_class"/>
-			<scroll_list.columns label="Nome" name="media_name"/>
-			<scroll_list.columns label="Depurar" name="media_debug"/>
+			<column label="Proximidade" name="media_proximity"/>
+			<column label="Visíveis" name="media_visibility"/>
+			<column label="Classe" name="media_class"/>
+			<column label="Nome" name="media_name"/>
+			<column label="Depurar" name="media_debug"/>
 		</scroll_list>
 		<panel name="media_controls_panel">
 			<layout_stack name="media_controls">