Merge from default branch

--HG--
branch : product-engine

28 files changed, 323 insertions, 262 deletions

diff --git a/indra/llui/lldockablefloater.cpp b/indra/llui/lldockablefloater.cpp
index a94f0206a6..0492ab0f25 100644
--- a/indra/llui/lldockablefloater.cpp
+++ b/indra/llui/lldockablefloater.cpp
@@ -95,7 +95,7 @@ void LLDockableFloater::toggleInstance(const LLSD& sdname)
 	LLDockableFloater* instance =
 			dynamic_cast<LLDockableFloater*> (LLFloaterReg::findInstance(name));
 	// if floater closed or docked
-	if (instance == NULL || instance != NULL && instance->isDocked())
+	if (instance == NULL || (instance && instance->isDocked()))
 	{
 		LLFloaterReg::toggleInstance(name, key);
 		// restore button toggle state
diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp
index 846b2843dd..5011b191f4 100644
--- a/indra/newview/llavatarlistitem.cpp
+++ b/indra/newview/llavatarlistitem.cpp
@@ -526,21 +526,30 @@ void LLAvatarListItem::updateChildren()
 LLView* LLAvatarListItem::getItemChildView(EAvatarListItemChildIndex child_view_index)
 {
 	LLView* child_view = mAvatarName;
-	if (child_view_index < 0 || ALIC_COUNT <= child_view_index)
-	{
-		LL_WARNS("AvatarItemReshape") << "Child view index is out of range: " << child_view_index << LL_ENDL;
-		return child_view;
-	}
+
 	switch (child_view_index)
 	{
-	case ALIC_ICON:					child_view = mAvatarIcon; break;
-	case ALIC_NAME:					child_view = mAvatarName; break;
-	case ALIC_INTERACTION_TIME:		child_view = mLastInteractionTime; break;
-	case ALIC_SPEAKER_INDICATOR:	child_view = mSpeakingIndicator; break;
-	case ALIC_INFO_BUTTON:			child_view = mInfoBtn; break;
-	case ALIC_PROFILE_BUTTON:		child_view = mProfileBtn; break;
+	case ALIC_ICON:
+		child_view = mAvatarIcon;
+		break;
+	case ALIC_NAME:
+		child_view = mAvatarName;
+		break;
+	case ALIC_INTERACTION_TIME:
+		child_view = mLastInteractionTime;
+		break;
+	case ALIC_SPEAKER_INDICATOR:
+		child_view = mSpeakingIndicator; 
+		break;
+	case ALIC_INFO_BUTTON:
+		child_view = mInfoBtn;
+		break;
+	case ALIC_PROFILE_BUTTON:
+		child_view = mProfileBtn;
+		break;
 	default:
 		LL_WARNS("AvatarItemReshape") << "Unexpected child view index is passed: " << child_view_index << LL_ENDL;
+		// leave child_view untouched
 	}
 	
 	return child_view;
diff --git a/indra/newview/llfloatergodtools.cpp b/indra/newview/llfloatergodtools.cpp
index 5294f09e64..eb56f387cd 100644
--- a/indra/newview/llfloatergodtools.cpp
+++ b/indra/newview/llfloatergodtools.cpp
@@ -213,6 +213,9 @@ void LLFloaterGodTools::showPanel(const std::string& panel_name)
 // static
 void LLFloaterGodTools::processRegionInfo(LLMessageSystem* msg)
 {
+	llassert(msg);
+	if (!msg) return;
+
 	LLHost host = msg->getSender();
 	if (host != gAgent.getRegionHost())
 	{
@@ -270,8 +273,7 @@ void LLFloaterGodTools::processRegionInfo(LLMessageSystem* msg)
 	if ( gAgent.isGodlike()
 		&& LLFloaterReg::instanceVisible("god_tools")
 		&& god_tools->mPanelRegionTools
-		&& god_tools->mPanelObjectTools
-		&& msg )
+		&& god_tools->mPanelObjectTools)
 	{
 		LLPanelRegionTools* rtool = god_tools->mPanelRegionTools;
 		god_tools->mCurrentHost = host;
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index f4d4ea3553..b6de409611 100644
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -788,8 +788,11 @@ void LLFloaterWorldMap::friendsChanged()
 	if(avatar_id.notNull())
 	{
 		LLCtrlSelectionInterface *iface = childGetSelectionInterface("friend combo");
-		if(!iface || !iface->setCurrentByID(avatar_id) || 
-			!t.getBuddyInfo(avatar_id)->isRightGrantedFrom(LLRelationship::GRANT_MAP_LOCATION) || gAgent.isGodlike())
+		const LLRelationship* buddy_info = t.getBuddyInfo(avatar_id);
+		if(!iface ||
+		   !iface->setCurrentByID(avatar_id) || 
+		   (buddy_info && !buddy_info->isRightGrantedFrom(LLRelationship::GRANT_MAP_LOCATION)) ||
+		   gAgent.isGodlike())
 		{
 			LLTracker::stopTracking(NULL);
 		}
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index ec2be0e8e9..5b59f52fa5 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -293,12 +293,27 @@ void LLInvFVBridge::removeBatchNoCheck(LLDynamicArray<LLFolderViewEventListener*
 	LLMessageSystem* msg = gMessageSystem;
 	const LLUUID trash_id = model->findCategoryUUIDForType(LLFolderType::FT_TRASH);
 	LLViewerInventoryItem* item = NULL;
-	LLViewerInventoryCategory* cat = NULL;
 	std::vector<LLUUID> move_ids;
 	LLInventoryModel::update_map_t update;
 	bool start_new_message = true;
 	S32 count = batch.count();
 	S32 i;
+
+	// first, hide any 'preview' floaters that correspond to the items
+	// being deleted.
+	for(i = 0; i < count; ++i)
+	{
+		bridge = (LLInvFVBridge*)(batch.get(i));
+		if(!bridge || !bridge->isItemRemovable()) continue;
+		item = (LLViewerInventoryItem*)model->getItem(bridge->getUUID());
+		if(item)
+		{
+			LLPreview::hide(item->getUUID());
+		}
+	}
+
+	// do the inventory move to trash
+
 	for(i = 0; i < count; ++i)
 	{
 		bridge = (LLInvFVBridge*)(batch.get(i));
@@ -308,7 +323,6 @@ void LLInvFVBridge::removeBatchNoCheck(LLDynamicArray<LLFolderViewEventListener*
 		{
 			if(item->getParentUUID() == trash_id) continue;
 			move_ids.push_back(item->getUUID());
-			LLPreview::hide(item->getUUID());
 			--update[item->getParentUUID()];
 			++update[trash_id];
 			if(start_new_message)
@@ -340,11 +354,12 @@ void LLInvFVBridge::removeBatchNoCheck(LLDynamicArray<LLFolderViewEventListener*
 		gInventory.accountForUpdate(update);
 		update.clear();
 	}
+
 	for(i = 0; i < count; ++i)
 	{
 		bridge = (LLInvFVBridge*)(batch.get(i));
 		if(!bridge || !bridge->isItemRemovable()) continue;
-		cat = (LLViewerInventoryCategory*)model->getCategory(bridge->getUUID());
+		LLViewerInventoryCategory* cat = (LLViewerInventoryCategory*)model->getCategory(bridge->getUUID());
 		if(cat)
 		{
 			if(cat->getParentUUID() == trash_id) continue;
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index f48c96190f..c66d067779 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -833,10 +833,13 @@ void LLLocationInputCtrl::refreshParcelIcons()
 		mDamageText->setVisible(false);
 	}
 
-	S32 left_pad, right_pad;
-	mTextEntry->getTextPadding(&left_pad, &right_pad);
-	right_pad = mTextEntry->getRect().mRight - x;
-	mTextEntry->setTextPadding(left_pad, right_pad);
+	if (mTextEntry)
+	{
+		S32 left_pad, right_pad;
+		mTextEntry->getTextPadding(&left_pad, &right_pad);
+		right_pad = mTextEntry->getRect().mRight - x;
+		mTextEntry->setTextPadding(left_pad, right_pad);
+	}
 }
 
 void LLLocationInputCtrl::refreshHealth()
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 1895993a8e..2d3401966b 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -1003,7 +1003,10 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata)
 		}
 		const LLUUID item_id = current_item->getListener()->getUUID();
 		LLViewerInventoryItem *item = gInventory.getItem(item_id);
-		item->regenerateLink();
+		if (item)
+		{
+			item->regenerateLink();
+		}
 		active_panel->setSelection(item_id, TAKE_FOCUS_NO);
 	}
 	if (command_name == "find_original")
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index 3221745fa3..f5a9f82d50 100644
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -955,8 +955,12 @@ BOOL LLPreviewLSL::postBuild()
 {
 	const LLInventoryItem* item = getItem();	
 
+	llassert(item);
+	if (item)
+	{
+		childSetText("desc", item->getDescription());
+	}
 	childSetCommitCallback("desc", LLPreview::onText, this);
-	childSetText("desc", item->getDescription());
 	childSetPrevalidate("desc", &LLTextValidate::validateASCIIPrintableNoPipe);
 
 	return LLPreview::postBuild();
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index fdf9e1df2e..fb78b6a415 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -1263,11 +1263,10 @@ bool LLToolPie::handleMediaClick(const LLPickInfo& pick)
 		return false;
 
 	LLMediaEntry* mep = (tep->hasMedia()) ? tep->getMediaData() : NULL;
-	
 	if(!mep)
 		return false;
 	
-	viewer_media_t media_impl = mep ? LLViewerMedia::getMediaImplFromTextureID(mep->getMediaID()) : NULL;
+	viewer_media_t media_impl = LLViewerMedia::getMediaImplFromTextureID(mep->getMediaID());
 
 	if (gSavedSettings.getBOOL("MediaOnAPrimUI"))
 	{
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 8c61ba7558..24a788aaed 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -3554,9 +3554,15 @@ bool LLHaveCallingcard::operator()(LLInventoryCategory* cat,
 
 BOOL is_agent_mappable(const LLUUID& agent_id)
 {
-	return (LLAvatarActions::isFriend(agent_id) &&
-		LLAvatarTracker::instance().getBuddyInfo(agent_id)->isOnline() &&
-		LLAvatarTracker::instance().getBuddyInfo(agent_id)->isRightGrantedFrom(LLRelationship::GRANT_MAP_LOCATION)
+	const LLRelationship* buddy_info = NULL;
+	bool is_friend = LLAvatarActions::isFriend(agent_id);
+
+	if (is_friend)
+		buddy_info = LLAvatarTracker::instance().getBuddyInfo(agent_id);
+
+	return (buddy_info &&
+		buddy_info->isOnline() &&
+		buddy_info->isRightGrantedFrom(LLRelationship::GRANT_MAP_LOCATION)
 		);
 }
 
@@ -6402,7 +6408,6 @@ class LLToolsSelectedScriptAction : public view_listener_t
 		else
 		{
 			llwarns << "Failed to generate LLFloaterScriptQueue with action: " << action << llendl;
-			delete queue;
 		}
 		return true;
 	}
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index f3bfc2e86c..3d153db733 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -5377,24 +5377,25 @@ LLVoiceClient::sessionState* LLVoiceClient::startUserIMSession(const LLUUID &uui
 		// No session with user, need to start one.
 		std::string uri = sipURIFromID(uuid);
 		session = addSession(uri);
+
+		llassert(session);
+		if (!session) return NULL;
+
 		session->mIsSpatial = false;
 		session->mReconnect = false;	
 		session->mIsP2P = true;
 		session->mCallerID = uuid;
 	}
 	
-	if(session)
+	if(session->mHandle.empty())
 	{
-		if(session->mHandle.empty())
-		{
-			// Session isn't active -- start it up.
-			sessionCreateSendMessage(session, false, true);
-		}
-		else
-		{	
-			// Session is already active -- start up text.
-			sessionTextConnectSendMessage(session);
-		}
+		// Session isn't active -- start it up.
+		sessionCreateSendMessage(session, false, true);
+	}
+	else
+	{	
+		// Session is already active -- start up text.
+		sessionTextConnectSendMessage(session);
 	}
 	
 	return session;
diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
index a357ba1d97..cc09835049 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
@@ -3,7 +3,7 @@
  background_visible="true"
  bevel_style="in"
  follows="left|top|right|bottom"
- height="570"
+ height="569"
  label="Edit Classified"
  layout="topleft"
  left="0"
@@ -23,7 +23,7 @@
      layout="topleft"
      name="back_btn"
      picture_style="true"
-     left="11"
+     left="12"
      tab_stop="false"
      top="2"
      width="23" />
@@ -46,12 +46,12 @@
      follows="all"
      height="502"
      layout="topleft"
-     left="9"
+     left="8"
      top_pad="10"
      name="profile_scroll"
      reserve_scroll_corner="false"
      opaque="true"
-     width="310">
+     width="312">
     <panel
      name="scroll_content_panel"
      follows="left|top"
@@ -71,15 +71,15 @@
      left="11"
      name="classified_snapshot" />
           <icon
-           height="18"
-           image_name="AddItem_Off"
+           height="197"
+           image_name="spacer24.tga"
            layout="topleft"
-           right="-5"
            name="edit_icon"
            label=""
            tool_tip="Click to select an image"
-           top="17"
-           width="18" />
+           top="10"
+           left="11"
+           width="286" />
         <text
          type="string"
          length="1"
@@ -232,7 +232,7 @@
      height="23"
      label="bottom_panel"
      layout="topleft"
-     left="9"
+     left="8"
      name="bottom_panel"
      top_pad="5"
      width="303">
@@ -252,6 +252,6 @@
          layout="topleft"
          name="cancel_btn"
          left_pad="3"
-         width="152" />
+         width="153" />
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
index 6ef762dc1d..657e369beb 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -3,7 +3,7 @@
  background_visible="true"
  bevel_style="in"
  follows="left|top|right|bottom"
- height="570"
+ height="569"
  label="Edit Pick"
  layout="topleft"
  left="0"
@@ -18,7 +18,7 @@
      image_overlay="BackArrow_Off"
      layout="topleft"
      name="back_btn"
-     left="11"
+     left="12"
      tab_stop="false"
      top="2"
      width="23" />
@@ -41,11 +41,11 @@
      follows="all"
      height="502"
      layout="topleft"
-     left="9"
+     left="8"
      top_pad="10"
      name="profile_scroll"
      opaque="true"
-     width="310">
+     width="312">
     <panel
      name="scroll_content_panel"
      follows="left|top|right"
@@ -66,15 +66,15 @@
      left="11"
      name="pick_snapshot" />
           <icon
-           height="18"
-           image_name="AddItem_Off"
+           height="197"
+           image_name="spacer24.tga"
            layout="topleft"
-           right="-5"
            name="edit_icon"
            label=""
            tool_tip="Click to select an image"
-           top="17"
-           width="18" />
+           top="10"
+           left="11"
+           width="286" />
         <text
          type="string"
          length="1"
@@ -172,7 +172,7 @@
      height="23"
      label="bottom_panel"
      layout="topleft"
-     left="9"
+     left="8"
      name="bottom_panel"
      top_pad="5"
      width="303">
@@ -192,6 +192,6 @@
          layout="topleft"
          name="cancel_btn"
          left_pad="3"
-        width="152" />
+        width="153" />
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
index 2a2199fc87..26be8440e7 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -60,11 +60,11 @@
  <scroll_container
      color="DkGray2"
      follows="all"
-     height="493"
+     height="494"
      min_height="300"
      layout="topleft"
-     left="9"
-     width="290"
+     left="8"
+     width="292"
      name="profile_scroll"
      reserve_scroll_corner="true"
      opaque="true"
@@ -74,19 +74,19 @@
          follows="left|top|right"
          layout="topleft"
          top="0"
-     height="493"
+     height="494"
      min_height="300"
          left="0"
-         width="290">
+         width="292">
     <panel
      name="data_panel"
      follows="left|top|right"
          layout="topleft"
          top="0"
-     height="493"
+     height="494"
      min_height="300"
          left="0"
-         width="290">
+         width="292">
      <panel
        name="lifes_images_panel"
          follows="left|top|right"
@@ -94,7 +94,7 @@
          layout="topleft"
          top="0"
          left="0"
-         width="290">
+         width="292">
 	 <panel
          follows="left|top"
          height="117"
@@ -102,7 +102,7 @@
          left="10"
          name="second_life_image_panel"
          top="0"
-         width="280">
+         width="282">
           <text
              follows="left|top|right"
 	     font.style="BOLD"
@@ -127,15 +127,15 @@
              width="102" />
           </panel>
            <icon
-           height="18"
-           image_name="AddItem_Off"
+           height="102"
+           image_name="spacer24.tga"
            layout="topleft"
            name="2nd_life_edit_icon"
            label=""
-           left="87"
+           left="11"
+           top_pad="-92"
            tool_tip="Click to select an image"
-           top="25"
-           width="18" />
+           width="102" />
       </panel>
       <text_editor
        type="string"
@@ -183,15 +183,15 @@
              width="102" />
           </panel>
            <icon
-           height="18"
-           image_name="AddItem_Off"
+           height="102"
+           image_name="spacer24.tga"
            layout="topleft"
            name="real_world_edit_icon"
            label=""
-           left="87"
+           left="11"
+           top_pad="-92"
            tool_tip="Click to select an image"
-           top="148"
-           width="18" />
+           width="102" />
        <text_editor
        type="string"
        length="1"
@@ -230,7 +230,7 @@
        top_pad="0"
        value="http://"
        name="homepage_edit"
-       width="270">
+       width="272">
       </line_editor>
       <check_box
        follows="left|top"
@@ -334,7 +334,7 @@
          height="23"
          label="Save Changes"
          layout="topleft"
-         left="9"
+         left="8"
          name="save_btn"
          top="5"
          width="152" />
@@ -343,8 +343,8 @@
          height="23"
          label="Cancel"
          layout="topleft"
-         left_pad="4"
+         left_pad="3"
          name="cancel_btn"
-         width="152" />
+         width="153" />
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
index 662fd1ae73..41e53be29e 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -3,7 +3,7 @@
  label="General"
  follows="all"
  height="604"
- width="313"
+ width="303"
  class="panel_group_general"
  name="general_tab">
     <panel.string
@@ -179,9 +179,9 @@ Hover your mouse over the options for more help.
          top_pad="5"
          width="295" />
    <panel
-         background_visible="true"
-         bevel_style="in"
-         border="true"
+         background_visible="false"
+         bevel_style="none"
+         border="false"
          bg_alpha_color="FloaterUnfocusBorderColor"
          follows="left|top|right"
          height="140"
diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index 375de64923..5373699c02 100644
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -40,7 +40,7 @@ background_visible="true"
      image_overlay="BackArrow_Off"
      layout="topleft"
      name="back"
-     left="10"
+     left="8"
      tab_stop="false"
      top="2"
      width="23" />
@@ -48,14 +48,14 @@ background_visible="true"
      layout="topleft"
      name="group_name"
      value="(Loading...)"
-      font="SansSerifHuge"
-      height="20"
-      left_pad="5"
-     text_color="white"
-      top="3"
+      font="SansSerifHugeBold"
+      height="26"
+      left_pad="10"
+     text_color="LtGray"
+      top="0"
      use_ellipses="true"
-      width="270"
-      follows="top|left"
+      width="275"
+      follows="top|left|right"
       word_wrap="true"
       mouse_opaque="false"/>
     <line_editor
@@ -75,12 +75,16 @@ background_visible="true"
      name="layout"
      orientation="vertical"
       follows="all"
-     left="0"
+     left="8"
      top_pad="0"
-     height="537"
-     width="313"
+     height="536"
+     width="292"
      border_size="0">
    <layout_panel
+         bg_alpha_color="DkGray2"
+         bg_opaque_color="DkGray2"
+ background_visible="true"
+ background_opaque="true"
       name="group_accordions"
       follows="all"
       layout="topleft"
@@ -155,10 +159,11 @@ background_visible="true"
          </accordion>
    </layout_panel>
    <layout_panel
-         height="25"
+         height="30"
          layout="topleft"
          auto_resize="false"
          left="0"
+         top_pad="0"
    name="button_row"
    follows="bottom|left"
    width="313">
@@ -167,56 +172,52 @@ background_visible="true"
      height="23"
      image_overlay="Refresh_Off"
      layout="topleft"
-     left="5"
-     top="0"
+     left="0"
+     top="5"
      name="btn_refresh"
      width="23" />
-    <button
-    follows="bottom|left"
-                 height="18"
-                 image_selected="AddItem_Press"
-                 image_unselected="AddItem_Off"
-                 image_disabled="AddItem_Disabled"
-                 layout="topleft"
-                 left_pad="2"
-                 top_delta="3"
-     name="btn_create"
-               visible="true"
-                 tool_tip="Create a new Group"
-                 width="18" />
-   <!-- <button
-     left_pad="10"
-     height="20"
-     label="Cancel"
-     label_selected="Cancel"
-     name="btn_cancel"
-     visible="false"
-     width="65" />-->
      <button
       follows="bottom|left"
      label="Chat"
      name="btn_chat"
-     left_pad="2"     
+     left_pad="3"     
      height="23"
-     top_delta="-3"
-     width="60" />
+     width="82" />
      <button
          follows="bottom|left"
-         left_pad="2"
+         left_pad="3"
          height="23"
      name="btn_call"
      label="Group Call"
          layout="topleft"
          tool_tip="Call this group"
-         width="95" />
+         width="112" />
      <button
      follows="bottom|left"
      height="23"
      label="Save"
      label_selected="Save"
      name="btn_apply"
-     left_pad="2"
-     width="85" />
+     left_pad="3"
+     width="82" />
+    <button
+    follows="bottom|left"
+                 height="23"
+                 layout="topleft"
+                 left="0"
+                 label="Create Group"
+     name="btn_create"
+               visible="true"
+                 tool_tip="Create a new Group"
+                 width="103" />
+   <!--<button
+     left_pad="3"
+     height="23"
+     label="Cancel"
+     label_selected="Cancel"
+     name="btn_cancel"
+     visible="false"
+     width="65" />-->
      </layout_panel>
   </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index 25a0213bde..7557e2cc5e 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -276,7 +276,7 @@ things in this group. There&apos;s a broad variety of Abilities.
     </tab_container>
     <panel
      height="350"
-     background_visible="true"
+     background_visible="false"
      bg_alpha_color="FloaterUnfocusBorderColor"
      layout="topleft"
      follows="top|left|right"
@@ -356,7 +356,7 @@ things in this group. There&apos;s a broad variety of Abilities.
     </panel>
     <panel
      height="550"
-     background_visible="true"
+     background_visible="false"
      bg_alpha_color="FloaterUnfocusBorderColor"
      layout="topleft"
      follows="top|left|right"
@@ -509,7 +509,7 @@ things in this group. There&apos;s a broad variety of Abilities.
     </panel>
    <panel
      height="424"
-     background_visible="true"
+     background_visible="false"
      bg_alpha_color="FloaterUnfocusBorderColor"
      layout="topleft"
      follows="top|left|right"
diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml
index 91d4cd6e83..e7104fd34e 100644
--- a/indra/newview/skins/default/xui/en/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml
@@ -7,7 +7,7 @@
    left="0"
    width="380"
    help_topic="panel_landmarks"
-   border="true"
+   border="false"
    background_visible="true"
    bg_alpha_color="DkGray2"
    follows="left|top|right|bottom">
@@ -85,11 +85,14 @@
         </accordion_tab>
     </accordion>
     <panel
-     background_visible="true"
+            bg_opaque_color="DkGray2"
+       bg_alpha_color="DkGray2"
+       background_visible="true"
+       background_opaque="true"
      bevel_style="none"
      bottom="0"
      follows="left|right|bottom"
-     height="30"
+     height="38"
      layout="bottomleft"
      left="0"
      name="bottom_panel"
@@ -104,7 +107,7 @@
          layout="topleft"
          left="10"
          name="options_gear_btn"
-         top="6"
+         top="10"
          width="18" />
         <button
          follows="bottom|left"
@@ -113,7 +116,7 @@
          image_unselected="AddItem_Off"
          image_disabled="AddItem_Disabled"
          layout="topleft"
-         left_pad="5"
+         left_pad="10"
          name="add_btn"
          tool_tip="Add new landmark"
          width="18" />
@@ -123,10 +126,10 @@
          image_selected="TrashItem_Press"
          image_unselected="TrashItem_Off"
          layout="topleft"
-         right="-5"
+         right="-10"
          name="trash_btn"
          tool_tip="Remove selected landmark"
-         top="6"
+         top="10"
          width="18" />
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_me.xml b/indra/newview/skins/default/xui/en/panel_me.xml
index a30d80f101..63c522ac69 100644
--- a/indra/newview/skins/default/xui/en/panel_me.xml
+++ b/indra/newview/skins/default/xui/en/panel_me.xml
@@ -4,7 +4,7 @@
  border="false"
  follows="all"
  height="570"
- label="My Profile!!!!!"
+ label="My Profile"
  layout="topleft"
  left="0"
  name="panel_me"
@@ -26,16 +26,16 @@
    </text> -->
     <tab_container
      follows="all"
-     height="570"
+     height="575"
      halign="center"
      layout="topleft"
-     left="6"
+     left="5"
      name="tabs"
      tab_min_width="95"
      tab_height="30"
      tab_position="top"
      top_pad="10"
-     width="315">
+     width="317">
       <panel
          class="panel_my_profile"
          filename="panel_my_profile.xml"
diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml
index d519569543..4112b65635 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -60,13 +60,13 @@
          left="0"
          name="profile_scroll"
          opaque="true"
-         height="492"
+         height="488"
          width="315"
          top="0">
           <panel
                 layout="topleft"
           follows="left|top|right"
-                height="492"
+                height="488"
                name="scroll_content_panel"
                 top="0"
                 left="0"
@@ -385,12 +385,12 @@
      user_resize="false" 
      auto_resize="false" 
      height="28"
-     width="313">
+     width="315">
         <button
          follows="bottom|right"
          height="23"
-         left="4"
-	 top="5"
+         left="6"
+	 top="1"
          label="Edit Profile"
          name="edit_profile_btn"
          tool_tip="Edit your personal information"
@@ -399,10 +399,10 @@
          follows="bottom|right"
          height="23"
          label="Edit Appearance"
-         left_pad="4"
+         left_pad="3"
          name="edit_appearance_btn"
          tool_tip="Create/edit your appearance: physical data, clothes and etc."
-         width="152" />
+         width="153" />
  </layout_panel>
 </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml
index ac100a2c06..cff7b51ce8 100644
--- a/indra/newview/skins/default/xui/en/panel_notes.xml
+++ b/indra/newview/skins/default/xui/en/panel_notes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  follows="all"
- height="540"
+ height="533"
  label="Notes &amp; Privacy"
  layout="topleft"
  left="0"
@@ -25,7 +25,7 @@
        layout="topleft"
        top="0"
        left="0"
-       height="475"
+       height="450"
        width="313">
         <scroll_container
          color="DkGray2"
@@ -34,7 +34,7 @@
          left="0"
          name="profile_scroll"
          opaque="true"
-         height="475"
+         height="450"
          width="313"
          top="0">
           <panel
@@ -46,35 +46,35 @@
            width="303">
             <text
              follows="left|top"
-             font="SansSerifBold"
+         font.style="BOLD"
              height="16"
              layout="topleft"
-             left="10"
+             left="11"
              name="status_message"
              text_color="white"
-             top="20"
+             top="10"
              value="My private notes:"
              width="293" />
             <text_editor
              follows="left|top"
              height="120"
              layout="topleft"
-             left="10"
+             left="12"
              max_length="1000"
              name="notes_edit"
              text_color="DkGray"
-             top_pad="10"
-             width="280"
+             top_pad="3"
+             width="288"
              word_wrap="true" />
             <text
              follows="left|top"
-             font="SansSerifBold"
+         font.style="BOLD"
              height="16"
              layout="topleft"
-             left="10"
+             left="11"
              name="status_message2"
              text_color="white"
-             top_pad="30"
+             top_pad="20"
              value="Allow this person to:"
              width="293" />
             <check_box
@@ -82,7 +82,7 @@
              height="16"
              label="See my online status"
              layout="topleft"
-             left="20"
+             left="10"
              name="status_check"
              width="293" />
             <check_box
@@ -90,7 +90,7 @@
              height="16"
              label="See me on the map"
              layout="topleft"
-             left="20"
+             left="10"
              name="map_check"
              width="293" />
             <check_box
@@ -98,7 +98,7 @@
              height="16"
              label="Edit, delete or take my objects"
              layout="topleft"
-             left="20"
+             left="10"
              name="objects_check"
              width="293" />
           </panel>
@@ -117,7 +117,7 @@
          height="23"
          label="Add Friend"
          layout="topleft"
-         left="0"
+         left="2"
          mouse_opaque="false"
          name="add_friend"
          tool_tip="Offer friendship to the Resident"
@@ -142,7 +142,7 @@
          tool_tip="Call this Resident"
          left_pad="3"
          top="5"
-         width="45" />
+         width="46" />
         <button
          enabled="false"
          follows="bottom|left"
diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml
index f3c63afedf..34738745eb 100644
--- a/indra/newview/skins/default/xui/en/panel_notification.xml
+++ b/indra/newview/skins/default/xui/en/panel_notification.xml
@@ -3,8 +3,8 @@
   background_opaque="false"
       border_visible="false"
   background_visible="true"
-  bg_alpha_color="0.3 0.3 0.3 0"
-  bg_opaque_color="0.3 0.3 0.3 0"
+  bg_alpha_color="1 0.3 0.3 0"
+  bg_opaque_color="1 0.3 0.3 0"
   label="notification_panel"
   layout="topleft"
   left="0"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 446bf0dc6e..752bccc351 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <!-- Side tray panel -->
 <panel
-background_visible="true"
  follows="all"
- height="575"
  label="People"
  layout="topleft"
+ height="449"
  min_height="350"
  name="people_panel"
  top="0"
@@ -33,7 +32,7 @@ background_visible="true"
      follows="left|top|right"
      height="23"
      layout="topleft"
-     left="15"
+     left="10"
      label="Filter"
      max_length="300"
      name="filter_input"
@@ -42,19 +41,23 @@ background_visible="true"
      width="303" />
     <tab_container
      follows="all"
-     height="500"
+     height="383"
      layout="topleft"
-     left="6"
+     left="5"
      name="tabs"
      tab_min_width="70"
      tab_height="30"
      tab_position="top"
      top_pad="10"
      halign="center"
-     width="313">
-        <panel
+     width="317">
+     	<panel
+            bg_opaque_color="DkGray2"
+       bg_alpha_color="DkGray2"
+       background_visible="true"
+       background_opaque="true"
          follows="all"
-         height="500"
+         height="383"
          label="NEARBY"
          layout="topleft"
          left="0"
@@ -65,7 +68,7 @@ background_visible="true"
             <avatar_list
              allow_select="true"
              follows="all"
-             height="470"
+             height="345"
              ignore_online_status="true"
              layout="topleft"
              left="0"
@@ -75,7 +78,7 @@ background_visible="true"
              width="313" />
             <panel
              follows="left|right|bottom"
-             height="30"
+             height="38"
              label="bottom_panel"
              layout="topleft"
              left="0"
@@ -91,7 +94,7 @@ background_visible="true"
              layout="topleft"
              left="10"
              name="nearby_view_sort_btn"
-             top="5"
+             top="10"
              width="18" />
              <button
                  follows="bottom|left"
@@ -100,9 +103,8 @@ background_visible="true"
                  image_unselected="AddItem_Off"
                  image_disabled="AddItem_Disabled"
                  layout="topleft"
-                 left_pad="5"
+                 left_pad="10"
                  name="add_friend_btn"
-                 top_delta="0"
                  tool_tip="Add selected Resident to your friends List"
                  width="18">
                <commit_callback
@@ -111,8 +113,12 @@ background_visible="true"
             </panel>
         </panel>
         <panel
+            bg_opaque_color="DkGray2"
+       bg_alpha_color="DkGray2"
+       background_visible="true"
+       background_opaque="true"
          follows="all"
-         height="500"
+         height="383"
          label="MY FRIENDS"
          layout="topleft"
          left="0"
@@ -122,7 +128,7 @@ background_visible="true"
          width="313">
             <accordion
              follows="all"
-             height="470"
+             height="345"
              layout="topleft"
              left="0"
              name="friends_accordion"
@@ -130,14 +136,14 @@ background_visible="true"
              width="313">
                 <accordion_tab
                  layout="topleft"
-                 height="235"
+                 height="172"
                  min_height="150"
                  name="tab_online"
                  title="Online">
                         <avatar_list
                          allow_select="true"
                          follows="all"
-                         height="235"
+                         height="172"
                          layout="topleft"
                          left="0"
                          multi_select="true"
@@ -147,13 +153,13 @@ background_visible="true"
                 </accordion_tab>
                 <accordion_tab
                  layout="topleft"
-                 height="235"
+                 height="173"
                  name="tab_all"
                  title="All">
                         <avatar_list
                          allow_select="true"
                          follows="all"
-                         height="235"
+                         height="173"
                          layout="topleft"
                          left="0"
                          multi_select="true"
@@ -162,20 +168,9 @@ background_visible="true"
                          width="313" />
                 </accordion_tab>
             </accordion>
-            <text
-             follows="all"
-             height="450"
-             left="10"
-             name="no_friends_msg"
-             top="10"
-             width="293"
-             wrap="true">
-                To add friends try [secondlife:///app/search/people global search] or click on a user to add them as a friend.
-If you're looking for people to hang out with, [secondlife:///app/worldmap try the Map].
-             </text>
             <panel
              follows="left|right|bottom"
-             height="30"
+             height="38"
              label="bottom_panel"
              layout="topleft"
              left="0"
@@ -191,7 +186,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
                layout="topleft"
                left="10"
                name="friends_viewsort_btn"
-               top="5"
+               top="10"
                width="18" />
                 <button
                  follows="bottom|left"
@@ -200,10 +195,9 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
                  image_unselected="AddItem_Off"
                  image_disabled="AddItem_Disabled"
                  layout="topleft"
-                 left_pad="5"
+                 left_pad="10"
                  name="add_btn"
                  tool_tip="Offer friendship to a Resident"
-                 top_delta="0"
                  width="18" />
                 <button
                  follows="bottom|left"
@@ -219,10 +213,25 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
                  top_delta="0"
                  width="18" />
             </panel>
+            <text
+             follows="all"
+             height="450"
+             left="10"
+             name="no_friends_msg"
+             top="10"
+             width="293"
+             wrap="true">
+                To add friends try [secondlife:///app/search/people global search] or click on a user to add them as a friend.
+If you're looking for people to hang out with, [secondlife:///app/worldmap try the Map].
+             </text>
         </panel>
         <panel
+            bg_opaque_color="DkGray2"
+       bg_alpha_color="DkGray2"
+       background_visible="true"
+       background_opaque="true"
          follows="all"
-         height="500"
+         height="383"
          label="MY GROUPS"
          layout="topleft"
          left="0"
@@ -232,7 +241,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
          width="313">
             <group_list
              follows="all"
-             height="470"
+             height="345"
              layout="topleft"
              left="0"
              name="group_list"
@@ -241,9 +250,8 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
              top="0"
              width="313" />
             <panel
-             top_pad="0"
              follows="left|right|bottom"
-             height="30"
+             height="38"
              label="bottom_panel"
              layout="topleft"
              left="0"
@@ -259,7 +267,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
                layout="topleft"
                left="10"
                name="groups_viewsort_btn"
-               top="7"
+               top="10"
                width="18" />
                 <button
                  follows="bottom|left"
@@ -268,10 +276,9 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
                  image_unselected="AddItem_Off"
                  image_disabled="AddItem_Disabled"
                  layout="topleft"
-                 left_pad="5"
+                 left_pad="10"
                  name="plus_btn"
                  tool_tip="Join group/Create new group"
-                 top_delta="0"
                  width="18" />
                 <button
                  follows="bottom|left"
@@ -280,16 +287,20 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
                  image_selected="Activate_Checkmark"
                  image_unselected="Activate_Checkmark"
                  layout="topleft"
-                 left_pad="24"
+                 left_pad="10"
                  name="activate_btn"
                  tool_tip="Activate selected group"
-                 top_delta="5"
+                 top_delta="4"
                  width="10" />
             </panel>
         </panel>
         <panel
+            bg_opaque_color="DkGray2"
+       bg_alpha_color="DkGray2"
+       background_visible="true"
+       background_opaque="true"
          follows="all"
-         height="500"
+         height="383"
          label="RECENT"
          layout="topleft"
          left="0"
@@ -300,7 +311,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
             <avatar_list
              allow_select="true"
              follows="all"
-             height="470"
+             height="345"
              layout="topleft"
              left="0"
              multi_select="true"
@@ -309,9 +320,8 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
              top="0"
              width="313" />
             <panel
-             top_pad="0"
              follows="left|right|bottom"
-             height="30"
+             height="38"
              label="bottom_panel"
              layout="topleft"
              left="0"
@@ -327,7 +337,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
                layout="topleft"
                left="10"
                name="recent_viewsort_btn"
-               top="7"
+               top="10"
                width="18" />
               <button
                  follows="bottom|left"
@@ -336,7 +346,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
                  image_unselected="AddItem_Off"
                  image_disabled="AddItem_Disabled"
                  layout="topleft"
-                 left_pad="5"
+                 left_pad="10"
                  name="add_friend_btn"
                  top_delta="0"
                  tool_tip="Add selected Resident to your friends List"
@@ -349,89 +359,82 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
     </tab_container>
     <panel
      follows="bottom|left"
-     height="35"
+     height="23"
      layout="topleft"
-     left="10"
+     left="8"
+     top_pad="0"
      name="button_bar"
      width="313">
         <button
          follows="bottom|left"
-         top="4"
-         left="0"
          height="23"
          label="Profile"
          layout="topleft"
          name="view_profile_btn"
          tool_tip="Show picture, groups, and other Residents information"
-         width="70" />
+         width="64" />
         <button
          follows="bottom|left"
-         top="4"
-         left_pad="2"
+         left_pad="3"
          height="23"
          label="IM"
          layout="topleft"
          name="im_btn"
          tool_tip="Open instant message session"
-         width="45" />
+         width="43" />
         <button
          follows="bottom|left"
-         top="4"
-         left_pad="2"
+         left_pad="3"
          height="23"
          label="Call"
          layout="topleft"
          name="call_btn"
          tool_tip="Call this Resident"
-         width="50" />
+         width="51" />
         <button
-         follows="left|top"
-         top="4"
-         left_pad="2"
+         follows="bottom|left"
+         left_pad="3"
          height="23"
          label="Share"
          layout="topleft"
          name="share_btn"
-         width="60" />
+         width="62" />
         <button
          follows="bottom|left"
-         top="4"
-         left_pad="2"
+         left_pad="3"
          height="23"
          label="Teleport"
          layout="topleft"
          name="teleport_btn"
          tool_tip="Offer teleport"
-         width="75" />
+         width="76" />
         <button
          follows="bottom|left"
-         top="4"
          left="0"
+         top_delta="0"
          height="23"
          label="Group Profile"
          layout="topleft"
          name="group_info_btn"
          tool_tip="Show group information"
-         width="102" />
+         width="107" />
         <button
          follows="bottom|left"
-         top="4"
-         left_pad="2"
+         left_pad="3"
          height="23"
          label="Group Chat"
          layout="topleft"
          name="chat_btn"
          tool_tip="Open chat session"
-         width="102" />
+         width="100" />
         <button
          follows="bottom|left"
-         top="4"
-         left_pad="2"
+         left_pad="3"
          height="23"
          label="Group Call"
          layout="topleft"
          name="group_call_btn"
          tool_tip="Call this group"
-         width="102" />
+         width="95" />
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml
index 097813131f..ecf5516390 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml
@@ -16,7 +16,7 @@
      image_overlay="BackArrow_Off"
      layout="topleft"
      name="back_btn"
-     left="11"
+     left="12"
      tab_stop="false"
      top="2"
      width="23" />
@@ -36,12 +36,12 @@
      color="DkGray2"
      opaque="true"
      follows="all"
-     height="502"
+     height="503"
      layout="topleft"
-     left="9"
+     left="8"
      top_pad="10"
      name="profile_scroll"
-     width="310">
+     width="312">
     <panel
      name="scroll_content_panel"
      follows="left|top|right"
@@ -116,7 +116,7 @@
      height="35"
      layout="topleft"
      top_pad="5"
-     left="9"
+     left="8"
      name="buttons">
         <button
          follows="bottom|left"
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 9ef3649d9c..54a5db9b16 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -4,7 +4,7 @@ bg_opaque_color="DkGray2"
        background_visible="true"
        background_opaque="true"
  follows="all"
- height="540"
+ height="547"
  label="Picks"
  layout="topleft"
  left="0"
@@ -30,7 +30,7 @@ bg_opaque_color="DkGray2"
  <accordion
   fit_parent="true" 
   follows="all"
-  height="465"
+  height="470"
   layout="topleft"
   left="0"
   name="accordion"
@@ -86,7 +86,7 @@ bg_opaque_color="DkGray2"
          label="bottom_panel"
          layout="topleft"
          name="edit_panel"
-         top_pad="0"
+         top_pad="-2"
          width="313">
             <button
              enabled="false"
@@ -130,8 +130,8 @@ bg_opaque_color="DkGray2"
        background_opaque="true"
          layout="topleft"
          left="0"
-         height="30"
-         top_pad="7"
+         height="40"
+         top="502"
          name="buttons_cucks"
          width="313">
        <button
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 351df22042..d72e175bc4 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -59,7 +59,7 @@
          left="0"
          name="profile_scroll"
          opaque="true"
-         height="524"
+         height="527"
          width="317"
          top="0">
           <panel
diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml
index 607de65c5c..5a96ba2dd2 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml
@@ -6,6 +6,7 @@
  layout="topleft"
  min_height="350"
  name="panel_target_profile"
+ left="0"
  width="333">
     <string
      name="status_online">
@@ -21,17 +22,19 @@
      image_overlay="BackArrow_Off"
      layout="topleft"
      name="back"
-     left="10"
+     left="12"
      tab_stop="false"
      top="2"
      width="23" />
     <text_editor
+    	h_pad="0"
+    	v_pad="0"
       allow_scroll="false"
       bg_visible="false"
       read_only = "true"
       follows="top|left|right"
       font="SansSerifHugeBold"
-      height="29"
+      height="26"
       layout="topleft"
       left_pad="10"
       name="user_name"
@@ -51,7 +54,7 @@
      width="150" />
     <tab_container
      follows="all"
-     height="535"
+     height="538"
      halign="center"
      layout="topleft"
      left="5"
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml
index eb95de3a7c..6ef93406ec 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -54,12 +54,19 @@
     mouse_opaque="false"
     background_visible="true"
   >
+    <panel_container
+      name="panel_container"
+      default_panel_name="panel_me"
+      width="333"
+    >
       <panel
         class="panel_me"
         name="panel_me"
         filename="panel_me.xml"
         label="Me"
       />
+
+    </panel_container>
   </sidetray_tab>
 
   <sidetray_tab