From 1febd28bd41f3ba0102a86da48f3098eebbbdb8a Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Wed, 30 Dec 2009 10:33:35 +0200
Subject: Fixed normal bug EXT-3740 - People panel should default to Nearby at
 first run.

--HG--
branch : product-engine
---
 indra/newview/llpanelpeople.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index 249a9ca1a0..e14a5778ad 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -574,7 +574,7 @@ BOOL LLPanelPeople::postBuild()
 	getChild<LLPanel>(GROUP_TAB_NAME)->childSetAction("groups_viewsort_btn",boost::bind(&LLPanelPeople::onGroupsViewSortButtonClicked,		this));
 
 	// Must go after setting commit callback and initializing all pointers to children.
-	mTabContainer->selectTabByName(FRIENDS_TAB_NAME);
+	mTabContainer->selectTabByName(NEARBY_TAB_NAME);
 
 	// Create menus.
 	LLUICtrl::CommitCallbackRegistry::ScopedRegistrar registrar;
-- 
cgit v1.2.3


From 3e7de89a6d0d58a34d9d75e9b114e9cf298276d6 Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Wed, 30 Dec 2009 14:21:14 +0200
Subject: Fixed normal bug (EXT-3714) No landmarks is shown in expanded
 accordeon after filter has been used. - Added applying filter upon accordion
 expansion to update currently filtered items.

--HG--
branch : product-engine
---
 indra/newview/llpanellandmarks.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp
index 87abb16395..30acf37f82 100644
--- a/indra/newview/llpanellandmarks.cpp
+++ b/indra/newview/llpanellandmarks.cpp
@@ -505,6 +505,10 @@ void LLLandmarksPanel::onAccordionExpandedCollapsed(const LLSD& param, LLPlacesI
 		{
 			gInventory.startBackgroundFetch(cat_id);
 		}
+
+		// Apply filter substring because it might have been changed
+		// while accordion was closed. See EXT-3714.
+		filter_list(inventory_list, sFilterSubString);
 	}
 }
 
-- 
cgit v1.2.3


From 8f30d5f20413eac9356a84647dfb051cc02e3ba3 Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Wed, 30 Dec 2009 14:38:22 +0200
Subject: EXT-2781. Added reference to issue in comments.

--HG--
branch : product-engine
---
 indra/newview/llagent.cpp         | 1 +
 indra/newview/llviewermessage.cpp | 1 +
 2 files changed, 2 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 79b0527a74..d2a56f65dd 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -751,6 +751,7 @@ void LLAgent::setFlying(BOOL fly)
 		// because in this case we won't get a signal to start avatar flying animation and
 		// it will be walking with flying mode "ON" indication. However we allow to switch
 		// the flying mode off if we get ANIM_AGENT_STANDUP signal. See process_avatar_animation().
+		// See EXT-2781.
 		if(fly && mAvatarObject->mSignaledAnimations.find(ANIM_AGENT_STANDUP) != mAvatarObject->mSignaledAnimations.end())
 		{
 			return;
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index f9f778449b..ed138f24ca 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -3947,6 +3947,7 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data)
 			// flying animation from server, the AGENT_CONTROL_FLY flag remains set but the
 			// avatar does not play flying animation, so we switch flying mode off.
 			// See LLAgent::setFlying(). This may cause "Stop Flying" button to blink.
+			// See EXT-2781.
 			if (animation_id == ANIM_AGENT_STANDUP && gAgent.getFlying())
 			{
 				gAgent.setFlying(FALSE);
-- 
cgit v1.2.3


From 3a50996058b3892fccb0196db23f8c36d5573b70 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Wed, 30 Dec 2009 14:50:57 +0200
Subject: Fixed normal bug EXT-3643 - Make Friend Offer dialog a modal alert.
 Added "Start IM" option to "OfferFriendship" notification.

--HG--
branch : product-engine
---
 indra/newview/llviewermessage.cpp                  | 33 +++++++++++++---------
 .../newview/skins/default/xui/en/notifications.xml |  4 +++
 2 files changed, 24 insertions(+), 13 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index ed138f24ca..6f9e551649 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -35,6 +35,7 @@
 
 #include "llanimationstates.h"
 #include "llaudioengine.h" 
+#include "llavataractions.h"
 #include "lscript_byteformat.h"
 #include "lleconomy.h"
 #include "llfloaterreg.h"
@@ -193,19 +194,25 @@ bool friendship_offer_callback(const LLSD& notification, const LLSD& response)
 		msg->sendReliable(LLHost(payload["sender"].asString()));
 		break;
 	}
-	case 1:
-	{
-		// decline
-		// We no longer notify other viewers, but we DO still send
-		// the rejection to the simulator to delete the pending userop.
-		msg->newMessageFast(_PREHASH_DeclineFriendship);
-		msg->nextBlockFast(_PREHASH_AgentData);
-		msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-		msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-		msg->nextBlockFast(_PREHASH_TransactionBlock);
-		msg->addUUIDFast(_PREHASH_TransactionID, payload["session_id"]);
-		msg->sendReliable(LLHost(payload["sender"].asString()));
-		break;
+	case 1: // Decline
+	case 2: // Send IM - decline and start IM session
+		{
+			// decline
+			// We no longer notify other viewers, but we DO still send
+			// the rejection to the simulator to delete the pending userop.
+			msg->newMessageFast(_PREHASH_DeclineFriendship);
+			msg->nextBlockFast(_PREHASH_AgentData);
+			msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+			msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+			msg->nextBlockFast(_PREHASH_TransactionBlock);
+			msg->addUUIDFast(_PREHASH_TransactionID, payload["session_id"]);
+			msg->sendReliable(LLHost(payload["sender"].asString()));
+
+			// start IM session
+			if(2 == option)
+			{
+				LLAvatarActions::startIM(payload["from_id"].asUUID());
+			}
 	}
 	default:
 		// close button probably, possibly timed out
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 9d3c31c4e6..95a7374e7b 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5121,6 +5121,10 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you [O
        index="1"
        name="Decline"
        text="Decline"/>
+      <button
+       index="2"
+       name="Send IM"
+       text="Send IM"/>
     </form>
   </notification>
   
-- 
cgit v1.2.3


From 8b93a0d83d15416a381261d7a47b535b36f40ff5 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Wed, 30 Dec 2009 16:05:59 +0200
Subject: =?UTF-8?q?fixed=20=20EXT-2787=20=E2=80=9COutdated=20voice=20chat?=
 =?UTF-8?q?=20invitation=20never=20hides=20itself=E2=80=9D,=20corrected=20?=
 =?UTF-8?q?check=20is=20invite=20from=20group=20or=20ad-hoc=20call=20to=20?=
 =?UTF-8?q?avoid=20hide=20incoming=20call=20dialog=20for=20that=20cases;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : product-engine
---
 indra/newview/llimview.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index a7ce027416..40227539d0 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -1748,7 +1748,8 @@ BOOL LLIncomingCallDialog::postBuild()
 	childSetAction("Start IM", onStartIM, this);
 	childSetFocus("Accept");
 
-	if(mPayload["notify_box_type"] != "VoiceInviteGroup" && mPayload["notify_box_type"] != "VoiceInviteAdHoc")
+	std::string notify_box_type = mPayload["notify_box_type"].asString();
+	if(notify_box_type != "VoiceInviteGroup" && notify_box_type != "VoiceInviteAdHoc")
 	{
 		// starting notification's timer for P2P and AVALINE invitations
 		mLifetimeTimer.start();
-- 
cgit v1.2.3


From c8294f2ad7b96058a3334d6b9655f3391a1da702 Mon Sep 17 00:00:00 2001
From: Andrew Polunin <apolunin@productengine.com>
Date: Wed, 30 Dec 2009 16:19:48 +0200
Subject: fixed normal bug (EXT-3731) Favorites Bar spaced too tightly (side
 effect was fixed)

--HG--
branch : product-engine
---
 indra/newview/llfavoritesbar.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
index ee33c189f9..6ae6b4877a 100644
--- a/indra/newview/llfavoritesbar.cpp
+++ b/indra/newview/llfavoritesbar.cpp
@@ -773,9 +773,9 @@ LLButton* LLFavoritesBarCtrl::createButton(const LLPointer<LLViewerInventoryItem
 	 * WORKAROUND:
 	 * there are some problem with displaying of fonts in buttons. 
 	 * Empty space (or ...) is displaying instead of last symbols, even though the width of the button is enough.
-	 * Problem will gone, if we  stretch out the button. For that reason I have to put additional  10 pixels. 
+	 * Problem will gone, if we  stretch out the button. For that reason I have to put additional  20 pixels.
 	 */
-	int requred_width = mFont->getWidth(item->getDisplayName()) + 10; 
+	int requred_width = mFont->getWidth(item->getDisplayName()) + 20;
 	int width = requred_width > def_button_width? def_button_width : requred_width;
 	LLFavoriteLandmarkButton* fav_btn = NULL;
 
-- 
cgit v1.2.3


From e214b6e360eeaf7252d6515b13db857881a63bcc Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Wed, 30 Dec 2009 16:46:53 +0200
Subject: Fixed major bug EXT-3747 ( Bottom bar resize behavior not to spec) --
 shifted chatbar left border 4 pixels left -- reduced distance between Speak,
 Gestures, Move, View, Snapshort buttons to 1 pixel For now minimal width of
 bottom tray with opened side panel is 687 pixels (1020 for viewer vindow)
 without truncating any buttons.

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_bottomtray.xml        | 20 ++++++++++----------
 .../skins/default/xui/en/panel_nearby_chat_bar.xml   |  6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 1ade66f2dd..f88f8264b5 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -47,7 +47,7 @@
          min_height="23"
          width="310"
          top="4"
-         min_width="192"
+         min_width="188"
          name="chat_bar"
          user_resize="false"
          filename="panel_nearby_chat_bar.xml" />
@@ -88,9 +88,9 @@
             layout="topleft"
             left="0"
             name="DUMMY"
-            min_width="4"
+            min_width="3"
             top="0"
-            width="4"/>
+            width="3"/>
         <layout_panel
          mouse_opaque="false"
          auto_resize="false"
@@ -126,10 +126,10 @@
          image_name="spacer24.tga"
          layout="topleft"
          left="0"
-         min_width="4"
+         min_width="3"
          name="DUMMY"
          top="0"
-         width="4"/>
+         width="3"/>
         <layout_panel
          mouse_opaque="false"
          auto_resize="false"
@@ -168,10 +168,10 @@
          image_name="spacer24.tga"
          layout="topleft"
          left="0"
-         min_width="4"
+         min_width="3"
          name="DUMMY"
          top="0"
-         width="4"/>
+         width="3"/>
         <layout_panel
          mouse_opaque="false"
          auto_resize="false"
@@ -211,10 +211,10 @@
          image_name="spacer24.tga"
          layout="topleft"
          left="0"
-         min_width="4"
+         min_width="3"
          name="DUMMY"
          top="0"
-         width="4"/>
+         width="3"/>
         <layout_panel
          mouse_opaque="false"
          auto_resize="false"
@@ -378,7 +378,7 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
          layout="topleft"
          min_height="28"
          top="0"
-         left_pad="4"
+         left_pad="3"
          name="notification_well_panel"
          width="35"
          min_width="35"
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
index 2543656a8b..f09a0e03ed 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
@@ -9,7 +9,7 @@
  top="21"
  width="310">
     <string name="min_width">
-        192
+        188
     </string>
     <string name="max_width">
         320
@@ -21,14 +21,14 @@
      height="23"
      label="Click here to chat."
      layout="topleft"
-     left_delta="7"
+     left_delta="3"
      text_pad_right="25"
      left="0"
      max_length="512"
      name="chat_box"
      tool_tip="Press Enter to say, Ctrl+Enter to shout"
      top="1"
-     width="279" />
+     width="283" />
     <output_monitor
      auto_update="true"
      follows="right"
-- 
cgit v1.2.3


From 5eb4d0b219ed0dd9928ecbcfbffe19fbaa318f22 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Wed, 30 Dec 2009 16:58:49 +0200
Subject: Fixed normal bug EXT-3762 - New notifications don't appear in the
 Notifications Well until they fade away in the channel.

--HG--
branch : product-engine
---
 indra/newview/llscreenchannel.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp
index 8c3f3dc5fb..da3f1543dd 100644
--- a/indra/newview/llscreenchannel.cpp
+++ b/indra/newview/llscreenchannel.cpp
@@ -234,6 +234,11 @@ void LLScreenChannel::addToast(const LLToast::Params& p)
 	if(show_toast)
 	{
 		mToastList.push_back(new_toast_elem);
+		if(p.can_be_stored)
+		{
+			// store toasts immediately - EXT-3762
+			storeToast(new_toast_elem);
+		}
 		updateShowToastsState();
 		redrawToasts();
 	}	
@@ -306,7 +311,6 @@ void LLScreenChannel::storeToast(ToastElem& toast_elem)
 	if( it != mStoredToastList.end() )
 		return;
 
-	toast_elem.toast->stopTimer();
 	mStoredToastList.push_back(toast_elem);
 	mOnStoreToast(toast_elem.toast->getPanel(), toast_elem.id);
 }
@@ -343,6 +347,13 @@ void LLScreenChannel::loadStoredToastByNotificationIDToChannel(LLUUID id)
 	mOverflowToastHidden = false;
 
 	LLToast* toast = (*it).toast;
+
+	if(toast->getVisible())
+	{
+		// toast is already in channel
+		return;
+	}
+
 	toast->setIsHidden(false);
 	toast->resetTimer();
 	mToastList.push_back((*it));
-- 
cgit v1.2.3


From 8da7889400a9dfeeefc5b9d7f9fb72aa093ae029 Mon Sep 17 00:00:00 2001
From: Denis Serdjuk <dserduk@productengine.com>
Date: Wed, 30 Dec 2009 17:37:45 +0200
Subject: fixed bug EXT-3722  New IM & Notification buttons can be clicked on,
 even when there's nothing to see Note: It was decided to  handle  an enabling
 of buttons from syswellwindow according to his empty state

--HG--
branch : product-engine
---
 indra/newview/llchiclet.cpp       | 11 +++++++++++
 indra/newview/llchiclet.h         |  4 +++-
 indra/newview/llsyswellwindow.cpp | 14 ++++++++------
 indra/newview/llsyswellwindow.h   |  3 +--
 4 files changed, 23 insertions(+), 9 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp
index c01202bb82..821b63ff04 100644
--- a/indra/newview/llchiclet.cpp
+++ b/indra/newview/llchiclet.cpp
@@ -225,6 +225,10 @@ void LLSysWellChiclet::setNewMessagesState(bool new_messages)
 	mIsNewMessagesState = new_messages;
 }
 
+void LLSysWellChiclet::updateWidget(bool is_window_empty)
+{
+	mButton->setEnabled(!is_window_empty);
+}
 // virtual
 BOOL LLSysWellChiclet::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
@@ -374,6 +378,13 @@ void LLNotificationChiclet::createMenu()
 		 LLViewerMenuHolderGL::child_registry_t::instance());
 }
 
+/*virtual*/
+void LLNotificationChiclet::setCounter(S32 counter)
+{
+	LLSysWellChiclet::setCounter(counter);
+	updateWidget(getCounter() == 0);
+	
+}
 //////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/llchiclet.h b/indra/newview/llchiclet.h
index ee9db10525..542fec2417 100644
--- a/indra/newview/llchiclet.h
+++ b/indra/newview/llchiclet.h
@@ -825,6 +825,8 @@ public:
 	void setToggleState(BOOL toggled);
 
 	void setNewMessagesState(bool new_messages);
+	//this method should change a widget according to state of the SysWellWindow 
+	virtual void updateWidget(bool is_window_empty);
 
 protected:
 
@@ -930,7 +932,7 @@ protected:
 	// methods for updating a number of unread System notifications
 	void incUreadSystemNotifications() { setCounter(++mUreadSystemNotifications); }
 	void decUreadSystemNotifications() { setCounter(--mUreadSystemNotifications); }
-
+	/*virtual*/ void setCounter(S32 counter);
 	S32 mUreadSystemNotifications;
 };
 
diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp
index 26d8338b24..a46ca1f8ac 100644
--- a/indra/newview/llsyswellwindow.cpp
+++ b/indra/newview/llsyswellwindow.cpp
@@ -106,15 +106,15 @@ void LLSysWellWindow::onStartUpToastClick(S32 x, S32 y, MASK mask)
 	setVisible(TRUE);
 }
 
-//---------------------------------------------------------------------------------
-LLSysWellWindow::~LLSysWellWindow()
-{
+void LLSysWellWindow::setSysWellChiclet(LLSysWellChiclet* chiclet) 
+{ 
+	mSysWellChiclet = chiclet;
+	if(mSysWellChiclet)
+		mSysWellChiclet->updateWidget(isWindowEmpty()); 
 }
-
 //---------------------------------------------------------------------------------
-void LLSysWellWindow::clear()
+LLSysWellWindow::~LLSysWellWindow()
 {
-	mMessageList->clear();
 }
 
 //---------------------------------------------------------------------------------
@@ -281,6 +281,7 @@ void LLSysWellWindow::handleItemAdded(EItemType added_item_type)
 
 		setResizeLimits(min_width,min_height);
 	}
+	mSysWellChiclet->updateWidget(isWindowEmpty());
 }
 
 void LLSysWellWindow::handleItemRemoved(EItemType removed_item_type)
@@ -294,6 +295,7 @@ void LLSysWellWindow::handleItemRemoved(EItemType removed_item_type)
 		// refresh list to recalculate mSeparator position
 		mMessageList->reshape(mMessageList->getRect().getWidth(), mMessageList->getRect().getHeight());
 	}
+	mSysWellChiclet->updateWidget(isWindowEmpty());
 }
 
 bool LLSysWellWindow::anotherTypeExists(EItemType item_type)
diff --git a/indra/newview/llsyswellwindow.h b/indra/newview/llsyswellwindow.h
index d21d095d1a..833e4dd504 100644
--- a/indra/newview/llsyswellwindow.h
+++ b/indra/newview/llsyswellwindow.h
@@ -62,7 +62,6 @@ public:
 	bool isWindowEmpty();
 
 	// Operating with items
-    void clear( void );
 	void removeItemByID(const LLUUID& id);
 
 	// Operating with outfit
@@ -74,7 +73,7 @@ public:
 
 	void onStartUpToastClick(S32 x, S32 y, MASK mask);
 
-	void setSysWellChiclet(LLSysWellChiclet* chiclet) { mSysWellChiclet = chiclet; }
+	void setSysWellChiclet(LLSysWellChiclet* chiclet);
 
 	// size constants for the window and for its elements
 	static const S32 MAX_WINDOW_HEIGHT		= 200;
-- 
cgit v1.2.3


From a7690df8b9d9329fb6a946a621b29890cfee76f0 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Wed, 30 Dec 2009 17:48:53 +0200
Subject: Code cleanup: removed stab implementation of Voice Control Panel

--HG--
branch : product-engine
---
 indra/newview/CMakeLists.txt | 2 --
 indra/newview/llchiclet.cpp  | 1 -
 indra/newview/llchiclet.h    | 1 -
 3 files changed, 4 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 648e582e94..561b51017d 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -516,7 +516,6 @@ set(viewer_SOURCE_FILES
     llvoground.cpp
     llvoicechannel.cpp
     llvoiceclient.cpp
-    llvoicecontrolpanel.cpp
     llvoiceremotectrl.cpp
     llvoicevisualizer.cpp
     llvoinventorylistener.cpp
@@ -1022,7 +1021,6 @@ set(viewer_HEADER_FILES
     llvoground.h
     llvoicechannel.h
     llvoiceclient.h
-    llvoicecontrolpanel.h
     llvoiceremotectrl.h
     llvoicevisualizer.h
     llvoinventorylistener.h
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp
index 821b63ff04..dc2e22f899 100644
--- a/indra/newview/llchiclet.cpp
+++ b/indra/newview/llchiclet.cpp
@@ -49,7 +49,6 @@
 #include "llscriptfloater.h"
 #include "lltextbox.h"
 #include "llvoiceclient.h"
-#include "llvoicecontrolpanel.h"
 #include "llgroupmgr.h"
 #include "llnotificationmanager.h"
 #include "lltransientfloatermgr.h"
diff --git a/indra/newview/llchiclet.h b/indra/newview/llchiclet.h
index 542fec2417..3665e4d093 100644
--- a/indra/newview/llchiclet.h
+++ b/indra/newview/llchiclet.h
@@ -41,7 +41,6 @@
 #include "llgroupmgr.h"
 #include "llimview.h"
 
-class LLVoiceControlPanel;
 class LLMenuGL;
 class LLIMFloater;
 
-- 
cgit v1.2.3


From 46e97785c9c7cd6d73d0be76d8bc265d307e39ba Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Wed, 30 Dec 2009 18:13:03 +0200
Subject: Fixed normal bug (EXT-3739) Task panel tabs in incorrect order, Home
 tab is missing. - Changed side tray tabs order.

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_side_tray.xml       | 58 +++++++++++-----------
 1 file changed, 29 insertions(+), 29 deletions(-)

(limited to 'indra/newview')

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 4565663bba..61f0fa3099 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -30,6 +30,24 @@
       />
   </sidetray_tab>
 
+  <sidetray_tab
+    name="sidebar_me"
+    help_topic="sidebar_me"
+    tab_title="My Profile"
+    description="Edit your public profile and Picks."
+    image="TabIcon_Me_Off"
+    image_selected="TabIcon_Me_Selected"
+    mouse_opaque="false"
+    background_visible="true"
+  >
+      <panel
+        class="panel_me"
+        name="panel_me"
+        filename="panel_me.xml"
+        label="Me"
+      />
+  </sidetray_tab>
+
   <sidetray_tab
     name="sidebar_people"
     help_topic="sidebar_people"
@@ -94,20 +112,21 @@
   </sidetray_tab>
 
   <sidetray_tab
-    name="sidebar_me"
-    help_topic="sidebar_me"
-    tab_title="My Profile"
-    description="Edit your public profile and Picks."
-    image="TabIcon_Me_Off"
-    image_selected="TabIcon_Me_Selected"
+    name="sidebar_inventory"
+    help_topic="sidebar_inventory"
+    tab_title="My Inventory"
+    description="Browse your inventory."
+    image="TabIcon_Things_Off"
+    image_selected="TabIcon_Things_Selected"
     mouse_opaque="false"
     background_visible="true"
   >
       <panel
-        class="panel_me"
-        name="panel_me"
-        filename="panel_me.xml"
-        label="Me"
+        class="sidepanel_inventory"
+        name="sidepanel_inventory"
+        filename="sidepanel_inventory.xml"
+        label="Edit Inventory"
+        font="SansSerifBold"
       />
   </sidetray_tab>
 
@@ -130,23 +149,4 @@
       />
   </sidetray_tab>
 
-  <sidetray_tab
-    name="sidebar_inventory"
-    help_topic="sidebar_inventory"
-    tab_title="My Inventory"
-    description="Browse your inventory."
-    image="TabIcon_Things_Off"
-    image_selected="TabIcon_Things_Selected"
-    mouse_opaque="false"
-    background_visible="true"
-  >
-      <panel
-        class="sidepanel_inventory"
-        name="sidepanel_inventory"
-        filename="sidepanel_inventory.xml"
-        label="Edit Inventory"
-        font="SansSerifBold"
-      />
-  </sidetray_tab>
-
 </side_tray>
-- 
cgit v1.2.3


From 20e2ed9c9c4b65de3761646cdb2b3babdac24e80 Mon Sep 17 00:00:00 2001
From: Andrew Polunin <apolunin@productengine.com>
Date: Wed, 30 Dec 2009 19:08:18 +0200
Subject: fixed normal bug (EXT-3738) Too much space above favorites on
 Favorites bar

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/main_view.xml            | 2 +-
 indra/newview/skins/default/xui/en/panel_bars.xml           | 2 +-
 indra/newview/skins/default/xui/en/panel_navigation_bar.xml | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index 65a545d2ed..861eb9009a 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -15,7 +15,7 @@
                 orientation="vertical"
                 top="19">
     <layout_panel auto_resize="false"
-                  height="65"
+                  height="60"
                   mouse_opaque="false"
                   name="nav_bar_container"
                   width="1024"
diff --git a/indra/newview/skins/default/xui/en/panel_bars.xml b/indra/newview/skins/default/xui/en/panel_bars.xml
index 527ec4e007..96722ce278 100644
--- a/indra/newview/skins/default/xui/en/panel_bars.xml
+++ b/indra/newview/skins/default/xui/en/panel_bars.xml
@@ -9,7 +9,7 @@
  width="1024">
   <layout_stack name="menu_stack" orientation="vertical" height="768" border_size="0">
     <panel auto_resize="false" width="1024" name="status_bar" filename="panel_status_bar.xml"/>
-    <panel auto_resize="false" width="1024" height="65" name="navigation bar" filename="panel_navigation_bar.xml"/>
+    <panel auto_resize="false" width="1024" height="60" name="navigation bar" filename="panel_navigation_bar.xml"/>
     <layout_stack name="hud_stack" orientation="horizontal" auto_resize="true" width="1024" height="500" follows="all">
       <panel auto_resize="true" name="floater_view" height="500"/>
       <panel auto_resize="false" filename="panel_side_tray.xml" height="500" width="333"/>
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 74265a51ca..005d7953fe 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -4,7 +4,7 @@
  background_visible="true"
  bg_opaque_color="MouseGray"
  follows="left|top|right"
- height="65"
+ height="60"
  layout="topleft"
  name="navigation_bar"
  chrome="true"
@@ -18,7 +18,7 @@
 	 visible="true"
 	 left="0"
 	 top="0"
-	 height="65"
+	 height="60"
 	 width="600"/>
 	<icon
 	 follows="all"
@@ -29,7 +29,7 @@
 	 visible="false"
 	 left="0"
 	 top="0"
-	 height="65"
+	 height="60"
 	 width="600"/>
 	<panel
 	 background_visible="false"
@@ -155,7 +155,7 @@
      left="0"
      name="favorite"
      image_drag_indication="arrow_down.tga"
-   bottom="62"
+   bottom="57"
    width="590">
     <chevron_button name=">>"
                      image_unselected="TabIcon_Close_Off"
-- 
cgit v1.2.3


From 0458c879483216e4b823db72ff5ee1a94c407cc8 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Wed, 30 Dec 2009 19:09:27 +0200
Subject: Work on task EXT-938 (Get rid of deprecated list controls) -- remove
 unused LLFloaterCall & LLPanelAvatarRow used in it.

--HG--
branch : product-engine
---
 indra/newview/llimpanel.cpp          | 1 -
 indra/newview/llviewerfloaterreg.cpp | 1 -
 indra/newview/llvoicechannel.cpp     | 1 -
 3 files changed, 3 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index 4b45a9aba9..029ddbaf2c 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -55,7 +55,6 @@
 #include "llgroupactions.h"
 #include "llfloater.h"
 #include "llfloateractivespeakers.h"
-#include "llfloatercall.h"
 #include "llavataractions.h"
 #include "llinventory.h"
 #include "llinventorymodel.h"
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 00db11a767..3a6c09f31f 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -53,7 +53,6 @@
 #include "llfloaterbuyland.h"
 #include "llfloaterbulkpermission.h"
 #include "llfloaterbump.h"
-#include "llfloatercall.h"
 #include "llfloatercamera.h"
 #include "llfloaterchat.h"
 #include "llfloaterchatterbox.h"
diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp
index 993853b9a6..18cdd23ed9 100644
--- a/indra/newview/llvoicechannel.cpp
+++ b/indra/newview/llvoicechannel.cpp
@@ -33,7 +33,6 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "llagent.h"
-#include "llfloatercall.h"
 #include "llfloaterreg.h"
 #include "llimview.h"
 #include "llnotifications.h"
-- 
cgit v1.2.3


From 90a1706870460dad89abd66762a125627df3e11c Mon Sep 17 00:00:00 2001
From: Denis Serdjuk <dserduk@productengine.com>
Date: Wed, 30 Dec 2009 19:31:07 +0200
Subject: fixed bug EXT-3761   Leave call button in the VCP shouldn't be
 resizable

--HG--
branch : product-engine
---
 .../default/xui/en/floater_voice_controls.xml      | 60 +++++++++++++++++++---
 1 file changed, 52 insertions(+), 8 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index 47fd03b8f6..1fa613468f 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -87,14 +87,58 @@
              visible="true"
              width="20" />
         </panel>
-        <button
-         follows="left|right|top"
-         height="24"
-         label="Leave Call"
-         left="91" 
-         name="leave_call_btn"
-         top_pad="6" 
-         width="100" />
+        <layout_stack
+         border_size="0"
+         clip="false"
+         follows="all"
+         height="28"
+         layout="topleft"
+         left="10"
+         mouse_opaque="false"
+         name="leave_call_stack"
+         orientation="horizontal"
+         top_pad="5"
+         width="263">
+         <layout_panel
+          auto_resize="true"
+          follows="left|right"
+          height="26"
+          layout="topleft"
+          min_height="23"
+          min_width="5"
+          mouse_opaque="false"
+          name="left_anchor"
+          width="80"/>
+         <layout_panel
+          auto_resize="false"
+          follows="left|right"
+          height="26"
+          layout="topleft"
+          mouse_opaque="false"
+          min_height="24"
+          min_width="100"
+          name="leave_call_btn_panel"
+          width="100">
+           <button
+            follows="left|right"
+            height="24"
+            label="Leave Call"
+            left="0"
+            name="leave_call_btn"
+            top="0"
+            width="100" />
+         </layout_panel>
+         <layout_panel
+         auto_resize="true"
+         follows="left|right"
+         height="26"
+         layout="topleft"
+         mouse_opaque="false"
+         min_height="24"
+         min_width="5"
+         name="right_anchor"
+         width="80"/>
+        </layout_stack>
     </panel>
     <avatar_list
      follows="all"
-- 
cgit v1.2.3


From d9a21cbff2fc842eb3959aa3ef730276c24990a7 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Wed, 30 Dec 2009 20:29:14 +0200
Subject: Fixed low bug EXT-3677 (Resident doesn't appear in the nearby voice
 list after enabling voice) -- fixed incorrect condition while checking if
 added avatar is a valid speaker (improvements for original fix -
 62a452bcea55)

--HG--
branch : product-engine
---
 indra/newview/llparticipantlist.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp
index db4f9a2d95..e2da4c4475 100644
--- a/indra/newview/llparticipantlist.cpp
+++ b/indra/newview/llparticipantlist.cpp
@@ -229,7 +229,7 @@ bool LLParticipantList::onAddItemEvent(LLPointer<LLOldEvents::LLEvent> event, co
 {
 	LLUUID uu_id = event->getValue().asUUID();
 
-	if (mValidateSpeakerCallback && mValidateSpeakerCallback(uu_id))
+	if (mValidateSpeakerCallback && !mValidateSpeakerCallback(uu_id))
 	{
 		return true;
 	}
-- 
cgit v1.2.3


From 2c19e7ddc9bebf9ad59b298644c1b3366b191d3c Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Wed, 30 Dec 2009 21:06:45 +0200
Subject: Fixed low bug (EXT-3769) Expand/Collpase All Folders menuitem in the
 Teleport History is enabled when nothing to expand/collapse - Added
 expanded/collapsed folders check.

--HG--
branch : product-engine
---
 indra/newview/llpanelteleporthistory.cpp           | 44 ++++++++++++++++++++++
 indra/newview/llpanelteleporthistory.h             |  1 +
 .../default/xui/en/menu_teleport_history_gear.xml  |  6 +++
 3 files changed, 51 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/llpanelteleporthistory.cpp b/indra/newview/llpanelteleporthistory.cpp
index 77c2fb7c8c..245f694ac6 100644
--- a/indra/newview/llpanelteleporthistory.cpp
+++ b/indra/newview/llpanelteleporthistory.cpp
@@ -452,6 +452,7 @@ BOOL LLTeleportHistoryPanel::postBuild()
 	registrar.add("TeleportHistory.ExpandAllFolders",  boost::bind(&LLTeleportHistoryPanel::onExpandAllFolders,  this));
 	registrar.add("TeleportHistory.CollapseAllFolders",  boost::bind(&LLTeleportHistoryPanel::onCollapseAllFolders,  this));
 	registrar.add("TeleportHistory.ClearTeleportHistory",  boost::bind(&LLTeleportHistoryPanel::onClearTeleportHistory,  this));
+	mEnableCallbackRegistrar.add("TeleportHistory.GearMenu.Enable", boost::bind(&LLTeleportHistoryPanel::isActionEnabled, this, _2));
 
 	LLMenuGL* gear_menu  = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_teleport_history_gear.xml",  gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
 	if(gear_menu)
@@ -979,6 +980,49 @@ void LLTeleportHistoryPanel::onGearButtonClicked()
 	LLMenuGL::showPopup(this, menu, menu_x, menu_y);
 }
 
+bool LLTeleportHistoryPanel::isActionEnabled(const LLSD& userdata) const
+{
+	S32 tabs_cnt = mItemContainers.size();
+
+	bool has_expanded_tabs = false;
+	bool has_collapsed_tabs = false;
+
+	for (S32 n = 0; n < tabs_cnt; n++)
+	{
+		LLAccordionCtrlTab* tab = mItemContainers.get(n);
+		if (!tab->getVisible())
+			continue;
+
+		if (tab->getDisplayChildren())
+		{
+			has_expanded_tabs = true;
+		}
+		else
+		{
+			has_collapsed_tabs = true;
+		}
+
+		if (has_expanded_tabs && has_collapsed_tabs)
+		{
+			break;
+		}
+	}
+
+	std::string command_name = userdata.asString();
+
+	if (has_expanded_tabs && command_name == "collapse_all")
+	{
+		return true;
+	}
+
+	if (has_collapsed_tabs && command_name ==  "expand_all")
+	{
+		return true;
+	}
+
+	return false;
+}
+
 void LLTeleportHistoryPanel::setAccordionCollapsedByUser(LLUICtrl* acc_tab, bool collapsed)
 {
 	LLSD param = acc_tab->getValue();
diff --git a/indra/newview/llpanelteleporthistory.h b/indra/newview/llpanelteleporthistory.h
index 0c0f891f32..4eeaec7705 100644
--- a/indra/newview/llpanelteleporthistory.h
+++ b/indra/newview/llpanelteleporthistory.h
@@ -97,6 +97,7 @@ private:
 	void handleItemSelect(LLFlatListView* );
 	LLFlatListView* getFlatListViewFromTab(LLAccordionCtrlTab *);
 	void onGearButtonClicked();
+	bool isActionEnabled(const LLSD& userdata) const;
 
 	void setAccordionCollapsedByUser(LLUICtrl* acc_tab, bool collapsed);
 	bool isAccordionCollapsedByUser(LLUICtrl* acc_tab);
diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml
index 6768d7fccb..134b331514 100644
--- a/indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml
@@ -13,12 +13,18 @@
      name="Expand all folders">
         <menu_item_call.on_click
          function="TeleportHistory.ExpandAllFolders" />
+        <on_enable
+         function="TeleportHistory.GearMenu.Enable"
+         parameter="expand_all" />
     </menu_item_call>
     <menu_item_call
      label="Collapse all folders"
      name="Collapse all folders">
         <menu_item_call.on_click
          function="TeleportHistory.CollapseAllFolders" />
+        <on_enable
+         function="TeleportHistory.GearMenu.Enable"
+         parameter="collapse_all" />
     </menu_item_call>
     <menu_item_separator layout="topleft" />
     <menu_item_call
-- 
cgit v1.2.3


From e9d799801da4c6c9b8ba3facf7e93bbe9906fe18 Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Wed, 30 Dec 2009 21:15:18 +0200
Subject: fixed build (removed missing files references from CMakefile)

--HG--
branch : product-engine
---
 indra/newview/CMakeLists.txt | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 561b51017d..a25f805437 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -157,7 +157,6 @@ set(viewer_SOURCE_FILES
     llfloaterbuycontents.cpp
     llfloaterbuycurrency.cpp
     llfloaterbuyland.cpp
-    llfloatercall.cpp
     llfloatercamera.cpp
     llfloaterchat.cpp
     llfloaterchatterbox.cpp
@@ -302,7 +301,6 @@ set(viewer_SOURCE_FILES
     lloutputmonitorctrl.cpp
     lloverlaybar.cpp
     llpanelavatar.cpp
-    llpanelavatarrow.cpp
     llpanelavatartag.cpp
     llpanelblockedlist.cpp
     llpanelclassified.cpp
@@ -667,7 +665,6 @@ set(viewer_HEADER_FILES
     llfloaterbuycontents.h
     llfloaterbuycurrency.h
     llfloaterbuyland.h
-    llfloatercall.h
     llfloatercamera.h
     llfloaterchat.h
     llfloaterchatterbox.h
@@ -806,7 +803,6 @@ set(viewer_HEADER_FILES
     lloutputmonitorctrl.h
     lloverlaybar.h
     llpanelavatar.h
-    llpanelavatarrow.h
     llpanelavatartag.h
     llpanelblockedlist.h
     llpanelclassified.h
-- 
cgit v1.2.3