From 765b9a0a8eace57564fe2725d0377963b4c82bda Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Thu, 25 Feb 2010 15:06:04 +0200
Subject: Fixed major EXT - 5670 (Resident name tabs are blocked in the
 Conversation window)

- Removed the profile pictures in the tabs and swiched to the use of simple LLButton instead of LLCustomButtonIconCtrl

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_im_container.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 65a05f3ec5..0f098bbb52 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -22,9 +22,7 @@
      tab_width="64"
      tab_max_width = "134"
      tab_height="16"
-     use_custom_icon_ctrl="true"
-     tab_icon_ctrl_pad="2"
-     halign="left"
+     halign="center"
      use_ellipses="true"
      top="0"
      width="390" />
-- 
cgit v1.3


From bf25f3fd00c836a1ac3e6d160aa3d97634da084f Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Thu, 25 Feb 2010 16:37:31 +0200
Subject: Work on normal bug EXT-4518 (movement & camera floaters should have
 window titles) -- done for Move floater. -- deprecated comments cleaned up

--HG--
branch : product-engine
---
 indra/newview/llmoveview.cpp                       | 27 +++++++++++++++++++---
 indra/newview/llmoveview.h                         |  2 +-
 .../skins/default/xui/en/floater_moveview.xml      | 12 ++++++++++
 3 files changed, 37 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp
index 97e2b5b86e..ac4b98734b 100644
--- a/indra/newview/llmoveview.cpp
+++ b/indra/newview/llmoveview.cpp
@@ -87,6 +87,7 @@ LLFloaterMove::LLFloaterMove(const LLSD& key)
 BOOL LLFloaterMove::postBuild()
 {
 	setIsChrome(TRUE);
+	setTitleVisible(TRUE); // restore title visibility after chrome applying
 	
 	LLDockableFloater::postBuild();
 	
@@ -353,6 +354,7 @@ void LLFloaterMove::updateButtonsWithMovementMode(const EMovementMode newMode)
 	showFlyControls(MM_FLY == newMode);
 	setModeTooltip(newMode);
 	setModeButtonToggleState(newMode);
+	setModeTitle(newMode);
 }
 
 void LLFloaterMove::showFlyControls(bool bShow)
@@ -420,11 +422,30 @@ void LLFloaterMove::setModeTooltip(const EMovementMode mode)
 	}
 }
 
+void LLFloaterMove::setModeTitle(const EMovementMode mode)
+{
+	std::string title; 
+	switch(mode)
+	{
+	case MM_WALK:
+		title = getString("walk_title");
+		break;
+	case MM_RUN:
+		title = getString("run_title");
+		break;
+	case MM_FLY:
+		title = getString("fly_title");
+		break;
+	default:
+		// title should be provided for all modes
+		llassert(false);
+		break;
+	}
+	setTitle(title);
+}
+
 /**
  * Updates position of the floater to be center aligned with Move button.
- * 
- * Because Tip floater created as dependent floater this method 
- * must be called before "showQuickTips()" to get Tip floater be positioned at the right side of the floater
  */
 void LLFloaterMove::updatePosition()
 {
diff --git a/indra/newview/llmoveview.h b/indra/newview/llmoveview.h
index 06463f02af..1bd36e4d74 100644
--- a/indra/newview/llmoveview.h
+++ b/indra/newview/llmoveview.h
@@ -92,7 +92,7 @@ private:
 	void showFlyControls(bool bShow);
 	void initModeTooltips();
 	void setModeTooltip(const EMovementMode mode);
-	void showQuickTips(const EMovementMode mode);
+	void setModeTitle(const EMovementMode mode);
 	void initModeButtonMap();
 	void setModeButtonToggleState(const EMovementMode mode);
 	void updateButtonsWithMovementMode(const EMovementMode newMode);
diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml
index 0a5820ce73..520741186e 100644
--- a/indra/newview/skins/default/xui/en/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/en/floater_moveview.xml
@@ -38,6 +38,18 @@
      name="fly_back_tooltip">
         Fly Backwards (press Down Arrow or S)
     </string>
+    <string
+     name="walk_title">
+        Walk
+    </string>
+    <string
+     name="run_title">
+        Run
+    </string>
+    <string
+     name="fly_title">
+        Fly
+    </string>
     <panel
      border="false"
      height="83"
-- 
cgit v1.3


From f7916bb6ca7aa6513981c9ebbd2e2491145f8f0c Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Thu, 25 Feb 2010 17:43:51 +0200
Subject: Work on normal bug EXT-4518 (movement & camera floaters should have
 window titles) -- done for Camera floater. -- also updated tooltip for
 Presets button

--HG--
branch : product-engine
---
 indra/newview/llfloatercamera.cpp                  | 28 ++++++++++++++++++++++
 indra/newview/llfloatercamera.h                    |  3 +++
 .../skins/default/xui/en/floater_camera.xml        | 18 +++++++++++++-
 3 files changed, 48 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp
index abf60a29b4..d0188352c7 100644
--- a/indra/newview/llfloatercamera.cpp
+++ b/indra/newview/llfloatercamera.cpp
@@ -241,6 +241,7 @@ LLFloaterCamera::LLFloaterCamera(const LLSD& val)
 BOOL LLFloaterCamera::postBuild()
 {
 	setIsChrome(TRUE);
+	setTitleVisible(TRUE); // restore title visibility after chrome applying
 
 	mRotate = getChild<LLJoystickCameraRotate>(ORBIT);
 	mZoom = getChild<LLPanelCameraZoom>(ZOOM);
@@ -295,6 +296,31 @@ void LLFloaterCamera::setMode(ECameraControlMode mode)
 	updateState();
 }
 
+void LLFloaterCamera::setModeTitle(const ECameraControlMode mode)
+{
+	std::string title; 
+	switch(mode)
+	{
+	case CAMERA_CTRL_MODE_ORBIT:
+		title = getString("orbit_mode_title");
+		break;
+	case CAMERA_CTRL_MODE_PAN:
+		title = getString("pan_mode_title");
+		break;
+	case CAMERA_CTRL_MODE_AVATAR_VIEW:
+		title = getString("avatar_view_mode_title");
+		break;
+	case CAMERA_CTRL_MODE_FREE_CAMERA:
+		title = getString("free_mode_title");
+		break;
+	default:
+		// title should be provided for all modes
+		llassert(false);
+		break;
+	}
+	setTitle(title);
+}
+
 void LLFloaterCamera::switchMode(ECameraControlMode mode)
 {
 	setMode(mode);
@@ -355,6 +381,8 @@ void LLFloaterCamera::updateState()
 	childSetVisible(PRESETS, CAMERA_CTRL_MODE_AVATAR_VIEW == mCurrMode);
 
 	updateCameraPresetButtons();
+	setModeTitle(mCurrMode);
+
 
 	//hiding or showing the panel with controls by reshaping the floater
 	bool showControls = CAMERA_CTRL_MODE_FREE_CAMERA != mCurrMode;
diff --git a/indra/newview/llfloatercamera.h b/indra/newview/llfloatercamera.h
index f908ad08be..b268839165 100644
--- a/indra/newview/llfloatercamera.h
+++ b/indra/newview/llfloatercamera.h
@@ -100,6 +100,9 @@ private:
 	/* sets a new mode preserving previous one and updates ui*/
 	void setMode(ECameraControlMode mode);
 
+	/** set title appropriate to passed mode */
+	void setModeTitle(const ECameraControlMode mode);
+
 	/* updates the state (UI) according to the current mode */
 	void updateState();
 
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index f69c763f78..b45e39a111 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -27,6 +27,22 @@
      name="move_tooltip">
         Move Camera Up and Down, Left and Right
     </floater.string>
+    <floater.string
+     name="orbit_mode_title">
+        Orbit
+    </floater.string>
+    <floater.string
+     name="pan_mode_title">
+        Pan
+    </floater.string>
+    <floater.string
+     name="avatar_view_mode_title">
+        Presets
+    </floater.string>
+    <floater.string
+     name="free_mode_title">
+        View Object
+    </floater.string>
     <panel
      border="false"
      height="110"
@@ -232,7 +248,7 @@
          image_selected="PushButton_Selected_Press"
          name="avatarview_btn"
          tab_stop="false"
-         tool_tip="See as avatar"
+         tool_tip="Presets"
          width="25">
         </button>
         <button
-- 
cgit v1.3


From 4d978eaf0a5f09e4758956cf41f4dcf2bafb9b42 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Thu, 25 Feb 2010 17:53:45 +0200
Subject: No ticket. Code cleanup: remove deprecated StopFlying button from the
 Move Floater. It uses separate button from Stand/Stop Flying panel

--HG--
branch : product-engine
---
 indra/newview/llmoveview.cpp                            | 16 ----------------
 indra/newview/llmoveview.h                              |  2 --
 indra/newview/skins/default/xui/en/floater_moveview.xml | 11 -----------
 3 files changed, 29 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp
index ac4b98734b..1853b511be 100644
--- a/indra/newview/llmoveview.cpp
+++ b/indra/newview/llmoveview.cpp
@@ -77,7 +77,6 @@ LLFloaterMove::LLFloaterMove(const LLSD& key)
 	mTurnRightButton(NULL),
 	mMoveUpButton(NULL),
 	mMoveDownButton(NULL),
-	mStopFlyingButton(NULL),
 	mModeActionsPanel(NULL),
 	mCurrentMode(MM_WALK)
 {
@@ -113,8 +112,6 @@ BOOL LLFloaterMove::postBuild()
 	mMoveDownButton->setHeldDownCallback(boost::bind(&LLFloaterMove::moveDown, this));
 
 
-	mStopFlyingButton = getChild<LLButton>("stop_fly_btn");
-
 	mModeActionsPanel = getChild<LLPanel>("panel_modes");
 
 	LLButton* btn;
@@ -127,11 +124,6 @@ BOOL LLFloaterMove::postBuild()
 	btn = getChild<LLButton>("mode_fly_btn");
 	btn->setCommitCallback(boost::bind(&LLFloaterMove::onFlyButtonClick, this));
 
-	btn = getChild<LLButton>("stop_fly_btn");
-	btn->setCommitCallback(boost::bind(&LLFloaterMove::onStopFlyingButtonClick, this));
-
-
-
 	showFlyControls(false);
 
 	initModeTooltips();
@@ -305,10 +297,6 @@ void LLFloaterMove::onFlyButtonClick()
 {
 	setMovementMode(MM_FLY);
 }
-void LLFloaterMove::onStopFlyingButtonClick()
-{
-	setMovementMode(gAgent.getAlwaysRun() ? MM_RUN : MM_WALK);
-}
 
 void LLFloaterMove::setMovementMode(const EMovementMode mode)
 {
@@ -361,10 +349,6 @@ void LLFloaterMove::showFlyControls(bool bShow)
 {
 	mMoveUpButton->setVisible(bShow);
 	mMoveDownButton->setVisible(bShow);
-
-	// *TODO: mantipov: mStopFlyingButton from the FloaterMove is not used now.
-	// It was not completly removed until functionality is reviewed by LL
-	mStopFlyingButton->setVisible(FALSE);
 }
 
 void LLFloaterMove::initModeTooltips()
diff --git a/indra/newview/llmoveview.h b/indra/newview/llmoveview.h
index 1bd36e4d74..dcca8308d9 100644
--- a/indra/newview/llmoveview.h
+++ b/indra/newview/llmoveview.h
@@ -86,7 +86,6 @@ private:
 	void onWalkButtonClick();
 	void onRunButtonClick();
 	void onFlyButtonClick();
-	void onStopFlyingButtonClick();
 	void initMovementMode();
 	void setMovementMode(const EMovementMode mode);
 	void showFlyControls(bool bShow);
@@ -108,7 +107,6 @@ public:
 	LLButton*				mMoveUpButton;
 	LLButton*				mMoveDownButton;
 private:
-	LLButton*				mStopFlyingButton;
 	LLPanel*				mModeActionsPanel;
 	
 	typedef std::map<LLView*, std::string> control_tooltip_map_t;
diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml
index 520741186e..8e2c57764b 100644
--- a/indra/newview/skins/default/xui/en/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/en/floater_moveview.xml
@@ -191,16 +191,5 @@
          tool_tip="Flying mode"
          top="2"
          width="31" />
-        <button
-         visible="false"
-         follows="left|bottom"
-         height="20"
-         label="Stop Flying"
-         layout="topleft"
-         left="0"
-         name="stop_fly_btn"
-         tool_tip="Stop flying"
-         top="2"
-         width="115" />
     </panel>
 </floater>
-- 
cgit v1.3


From 087ea1cef62d383821e8e340551e757cb604b553 Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Thu, 25 Feb 2010 18:47:28 +0200
Subject: Fixed normal bug (EXT-5748) Useless area on Place Profile panel. -
 Reduced unused size in Place Profile and Landmark Info panels.

--HG--
branch : product-engine
---
 indra/newview/llpanelplaceinfo.cpp                         | 2 +-
 indra/newview/skins/default/xui/en/panel_landmark_info.xml | 4 ++--
 indra/newview/skins/default/xui/en/panel_place_profile.xml | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/llpanelplaceinfo.cpp b/indra/newview/llpanelplaceinfo.cpp
index 9ebc8ca2b9..f6133d4446 100644
--- a/indra/newview/llpanelplaceinfo.cpp
+++ b/indra/newview/llpanelplaceinfo.cpp
@@ -256,7 +256,7 @@ void LLPanelPlaceInfo::reshape(S32 width, S32 height, BOOL called_from_parent)
 	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
 
 	S32 scroll_height = mScrollContainer->getRect().getHeight();
-	if (mScrollingPanelMinHeight >= scroll_height)
+	if (mScrollingPanelMinHeight > scroll_height)
 	{
 		mScrollingPanel->reshape(mScrollingPanelWidth, mScrollingPanelMinHeight);
 	}
diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
index 66070c028d..befeb182f9 100644
--- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
@@ -89,13 +89,13 @@
         <panel
          bg_alpha_color="DkGray2"
          follows="left|top|right"
-         height="700"
+         height="630"
          layout="topleft"
          left="0"
          min_height="300"
          name="scrolling_panel"
          top="0"
-         width="285">
+         width="310">
             <texture_picker
              enabled="false"
          follows="left|top|right"
diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml
index b22dad5841..7672bd0799 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -174,13 +174,13 @@
         <panel
          bg_alpha_color="DkGray2"
          follows="left|top|right"
-         height="700"
+         height="532"
          layout="topleft"
          left="0"
          min_height="300"
          name="scrolling_panel"
          top="0"
-         width="285">
+         width="310">
             <texture_picker
              enabled="false"
          follows="left|top|right"
-- 
cgit v1.3


From a325df08987636b00a5e81f08ee1d2a532636d72 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Thu, 25 Feb 2010 19:39:16 +0200
Subject: Fixed bug EXT-5580 (Characters in Inventory Filter appear behind X).

Added configurable text right padding support to search_filter:
* When the Clear button is enabled
  (i.e. search_editor.clear_button_visible set to "true")
  the search_editor.clear_button.pad_left parameter determines the padding.
* Otherwise search_editor.text_pad_right is used.

--HG--
branch : product-engine
---
 indra/llui/llsearcheditor.cpp                             | 15 +++++++++++----
 .../skins/default/xui/en/widgets/search_editor.xml        |  2 ++
 2 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/llui/llsearcheditor.cpp b/indra/llui/llsearcheditor.cpp
index 8075575bab..ec2ad5e5fa 100644
--- a/indra/llui/llsearcheditor.cpp
+++ b/indra/llui/llsearcheditor.cpp
@@ -44,17 +44,28 @@ LLSearchEditor::LLSearchEditor(const LLSearchEditor::Params& p)
 	S32 srch_btn_top = p.search_button.top_pad + p.search_button.rect.height;
 	S32 srch_btn_right = p.search_button.rect.width + p.search_button.left_pad;
 	LLRect srch_btn_rect(p.search_button.left_pad, srch_btn_top, srch_btn_right, p.search_button.top_pad);
+
+	S32 clr_btn_top = p.clear_button.rect.bottom + p.clear_button.rect.height;
+	S32 clr_btn_right = getRect().getWidth() - p.clear_button.pad_right;
+	S32 clr_btn_left = clr_btn_right - p.clear_button.rect.width;
+	LLRect clear_btn_rect(clr_btn_left, clr_btn_top, clr_btn_right, p.clear_button.rect.bottom);
+
 	S32 text_pad_left = p.text_pad_left;
+	S32 text_pad_right = p.text_pad_right;
 
 	if (p.search_button_visible)
 		text_pad_left += srch_btn_rect.getWidth();
 
+	if (p.clear_button_visible)
+		text_pad_right = getRect().getWidth() - clr_btn_left + p.clear_button.pad_left;
+
 	// Set up line editor.
 	LLLineEditor::Params line_editor_params(p);
 	line_editor_params.name("filter edit box");
 	line_editor_params.rect(getLocalRect());
 	line_editor_params.follows.flags(FOLLOWS_ALL);
 	line_editor_params.text_pad_left(text_pad_left);
+	line_editor_params.text_pad_right(text_pad_right);
 	line_editor_params.revert_on_esc(false);
 	line_editor_params.commit_callback.function(boost::bind(&LLUICtrl::onCommit, this));
 	line_editor_params.keystroke_callback(boost::bind(&LLSearchEditor::handleKeystroke, this));
@@ -82,10 +93,6 @@ LLSearchEditor::LLSearchEditor(const LLSearchEditor::Params& p)
 		// Set up clear button.
 		LLButton::Params clr_btn_params(p.clear_button);
 		clr_btn_params.name(std::string("clear button"));
-		S32 clr_btn_top = clr_btn_params.rect.bottom + clr_btn_params.rect.height;
-		S32 clr_btn_right = getRect().getWidth() - clr_btn_params.pad_right;
-		S32 clr_btn_left = clr_btn_right - clr_btn_params.rect.width;
-		LLRect clear_btn_rect(clr_btn_left, clr_btn_top, clr_btn_right, p.clear_button.rect.bottom);
 		clr_btn_params.rect(clear_btn_rect) ;
 		clr_btn_params.follows.flags(FOLLOWS_RIGHT|FOLLOWS_TOP);
 		clr_btn_params.tab_stop(false);
diff --git a/indra/newview/skins/default/xui/en/widgets/search_editor.xml b/indra/newview/skins/default/xui/en/widgets/search_editor.xml
index a9a760b3a4..32e443a058 100644
--- a/indra/newview/skins/default/xui/en/widgets/search_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/search_editor.xml
@@ -3,6 +3,7 @@
   clear_button_visible="false"
   search_button_visible="true"
   text_pad_left="6" 
+  text_pad_right="6" 
   select_on_focus="true"
   text_tentative_color="TextFgTentativeColor"
   background_image="TextField_Search_Off"
@@ -21,5 +22,6 @@
    image_unselected="Icon_Close_Foreground"
    image_selected="Icon_Close_Press"
    pad_right="4"
+   pad_left="4"
    width="16" />
 </search_editor>
-- 
cgit v1.3


From fa3dbae2cceffa8cdf8038d56eba3fac1bb67838 Mon Sep 17 00:00:00 2001
From: Denis Serdjuk <dserduk@productengine.com>
Date: Thu, 25 Feb 2010 20:07:47 +0200
Subject: fixed Normal Bug EXT-5675 Empty friends list mentions \"click\" where
 it should specify \"right-click\"

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_people.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index daab52f06a..2a475142d4 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -222,7 +222,7 @@
              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.
+                To add friends try [secondlife:///app/search/people global search] or use right click on a user in world to add them as a friend.
 If you're looking for people to hang out with, [secondlife:///app/worldmap try the Map].
              </text>
         </panel>
-- 
cgit v1.3


From 92facf86d6bf1a7acecdc6e536ac2ad7bcdfdd96 Mon Sep 17 00:00:00 2001
From: Denis Serdjuk <dserduk@productengine.com>
Date: Fri, 26 Feb 2010 11:42:59 +0200
Subject: Additional commit for EXT-5675. "in world" part of message has been
 removed to avoid misunderstanding.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_people.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 2a475142d4..f0186a46bb 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -222,7 +222,7 @@
              top="10"
              width="293"
              wrap="true">
-                To add friends try [secondlife:///app/search/people global search] or use right click on a user in world to add them as a friend.
+                To add friends try [secondlife:///app/search/people global search] or use right 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>
-- 
cgit v1.3