From df67c34b42837a782ee76f71d1a63fe93ea0ec08 Mon Sep 17 00:00:00 2001
From: Dessie Linden <dessie@lindenlab.com>
Date: Wed, 29 Sep 2010 11:13:39 -0700
Subject: Added tag 2.2.0-beta1 for changeset 7076e22f9f43

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index f761bdc158..4460becff8 100644
--- a/.hgtags
+++ b/.hgtags
@@ -24,3 +24,4 @@ d40ac9dd949cba6dab1cc386da6a2027690c2519 alpha-5
 d6781e22543acd7e21b967209f3c6e7003d380e3 fork to viewer-2-0
 c6e6324f5be1401f077ad18a4a0f6b46451c2f7b last_sprint
 7076e22f9f43f479a4ea75eac447a36364bead5a beta_2.1.3
+7076e22f9f43f479a4ea75eac447a36364bead5a 2.2.0-beta1
-- 
cgit v1.2.3


From a3584c383efa433671ee3ef9e139081c021a3b76 Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Fri, 1 Oct 2010 22:23:07 +0300
Subject: STORM-264 FIXED Add lower-right corner resize marker for detached
 side panels. Detached SP now has a slightly reduced height not to make it
 flush with the bottom bar.

---
 indra/newview/llsidetray.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp
index 9ee504cc4c..426ad26f1b 100644
--- a/indra/newview/llsidetray.cpp
+++ b/indra/newview/llsidetray.cpp
@@ -57,6 +57,8 @@ using namespace LLNotificationsUI;
 static LLRootViewRegistry::Register<LLSideTray>	t1("side_tray");
 static LLDefaultChildRegistry::Register<LLSideTrayTab>	t2("sidetray_tab");
 
+static const S32 BOTTOM_BAR_PAD = 5;
+
 static const std::string COLLAPSED_NAME = "<<";
 static const std::string EXPANDED_NAME  = ">>";
 
@@ -316,6 +318,9 @@ void LLSideTrayTab::undock(LLFloater* floater_tab)
 	floater_tab->setTitle(mTabTitle);
 	floater_tab->setName(getName());
 
+	// Resize handles get obscured by added panel so move them to front.
+	floater_tab->moveResizeHandlesToFront();
+
 	// Reshape the floater if needed.
 	LLRect floater_rect;
 	if (floater_tab->hasSavedRect())
@@ -327,13 +332,18 @@ void LLSideTrayTab::undock(LLFloater* floater_tab)
 	{
 		// Detaching for the first time. Reshape the floater.
 		floater_rect = side_tray->getLocalRect();
+
+		// Reduce detached floater height by small BOTTOM_BAR_PAD not to make it flush with the bottom bar.
+		floater_rect.mBottom += LLBottomTray::getInstance()->getRect().getHeight() + BOTTOM_BAR_PAD;
+		floater_rect.makeValid();
 		floater_tab->reshape(floater_rect.getWidth(), floater_rect.getHeight());
 	}
 
 	// Reshape the panel.
 	{
-		LLRect panel_rect = floater_rect;
+		LLRect panel_rect = floater_tab->getLocalRect();
 		panel_rect.mTop -= floater_tab->getHeaderHeight();
+		panel_rect.makeValid();
 		setRect(panel_rect);
 		reshape(panel_rect.getWidth(), panel_rect.getHeight());
 	}
-- 
cgit v1.2.3


From 60e8d3c6579ab1e2dbf7a1d7c7ac5cb7d3c8296a Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Thu, 30 Sep 2010 14:26:19 +0300
Subject: STORM-212 FIXED Gear button is always disabled in My Profile->My
 Picks

- Deleted gear button as unnecessary. There is no functionality for it.
---
 indra/newview/skins/default/xui/en/panel_picks.xml | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 4f7c4fa9b2..978b204df9 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -106,18 +106,6 @@ bg_opaque_color="DkGray2"
 		      user_resize="false" 
 		      auto_resize="true"
 			  width="51">
-	            <button
-	             enabled="false"
-	             follows="bottom|left"
-	             height="18"
-	             image_selected="OptionsMenu_Press"
-	             image_unselected="OptionsMenu_Off"
-	             image_disabled="OptionsMenu_Disabled"
-	             layout="topleft"
-	             left="0"
-	             name="gear_menu_btn"
-	             top_pad="0"
-	             width="18" />
 				<button
 	             follows="bottom|left"
 	             height="18"
@@ -125,9 +113,10 @@ bg_opaque_color="DkGray2"
 	             image_selected="AddItem_Press"
 	             image_unselected="AddItem_Off"
 	             layout="topleft"
-	             left_pad="15"
+	             left="0"
 	             name="new_btn"
 	             tool_tip="Create a new pick or classified at the current location"
+	             top="0"
 	             width="18" />
 		  </layout_panel>
 		  
-- 
cgit v1.2.3


From 2e7f87c0212610685b65fa52a02b9811fb7cf631 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Mon, 4 Oct 2010 16:07:37 -0700
Subject: CT-575 WIP ignore. testing access to beta branch.

---
 indra/newview/skins/default/xui/en/floater_aaa.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml
index cae6146880..d78fb281a9 100644
--- a/indra/newview/skins/default/xui/en/floater_aaa.xml
+++ b/indra/newview/skins/default/xui/en/floater_aaa.xml
@@ -19,7 +19,7 @@
  width="320">
   <string name="nudge_parabuild" translate="false">Nudge 1</string>
   <string name="test_the_vlt">This string CHANGE2 is extracted.</string>
-  <string name="testing_eli">Just a test. changes.</string>
+  <string name="testing_eli">Testing access to beta branch</string>
   <chat_history
    parse_urls="true"
    bg_readonly_color="ChatHistoryBgColor"
-- 
cgit v1.2.3