1 files changed, 78 insertions, 8 deletions

diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp
index a2dc97f7f5..98e492cada 100644
--- a/indra/newview/llchiclet.cpp
+++ b/indra/newview/llchiclet.cpp
@@ -38,6 +38,7 @@
 #include "llgroupactions.h"
 #include "lliconctrl.h"
 #include "llimpanel.h"				// LLFloaterIMPanel
+#include "llimfloater.h"
 #include "llimview.h"
 #include "llfloaterreg.h"
 #include "lllocalcliprect.h"
@@ -47,6 +48,8 @@
 #include "llvoiceclient.h"
 #include "llvoicecontrolpanel.h"
 #include "llgroupmgr.h"
+#include "llnotificationmanager.h"
+#include "lltransientfloatermgr.h"
 
 static LLDefaultChildRegistry::Register<LLChicletPanel> t1("chiclet_panel");
 static LLDefaultChildRegistry::Register<LLTalkButton> t2("chiclet_talk");
@@ -84,7 +87,6 @@ LLNotificationChiclet::LLNotificationChiclet(const Params& p)
 : LLChiclet(p)
 , mButton(NULL)
 , mCounterCtrl(NULL)
-, mNotificationChicletWindow(NULL)
 {
 	LLButton::Params button_params = p.button;
 	button_params.rect(p.rect());
@@ -94,6 +96,11 @@ LLNotificationChiclet::LLNotificationChiclet(const Params& p)
  	LLChicletNotificationCounterCtrl::Params unread_params = p.unread_notifications;
 	mCounterCtrl = LLUICtrlFactory::create<LLChicletNotificationCounterCtrl>(unread_params);
 	addChild(mCounterCtrl);
+
+	// connect counter handlers to the signals
+	connectCounterUpdatersToSignal("notify");
+	connectCounterUpdatersToSignal("groupnotify");
+	connectCounterUpdatersToSignal("notifytoast");
 }
 
 LLNotificationChiclet::~LLNotificationChiclet()
@@ -101,6 +108,25 @@ LLNotificationChiclet::~LLNotificationChiclet()
 
 }
 
+void LLNotificationChiclet::connectCounterUpdatersToSignal(std::string notification_type)
+{
+	LLNotificationsUI::LLNotificationManager* manager = LLNotificationsUI::LLNotificationManager::getInstance();
+	LLNotificationsUI::LLEventHandler* n_handler = manager->getHandlerForNotification(notification_type);
+	if(n_handler)
+	{
+		if(notification_type == "notifytoast")
+		{
+			n_handler->setNewNotificationCallback(boost::bind(&LLNotificationChiclet::updateUreadIMNotifications, this));
+			n_handler->setDelNotification(boost::bind(&LLNotificationChiclet::updateUreadIMNotifications, this));
+		}
+		else
+		{
+			n_handler->setNewNotificationCallback(boost::bind(&LLNotificationChiclet::incUreadSystemNotifications, this));
+			n_handler->setDelNotification(boost::bind(&LLNotificationChiclet::decUreadSystemNotifications, this));
+		}
+	}
+}
+
 void LLNotificationChiclet::setCounter(S32 counter)
 {
 	mCounterCtrl->setCounter(counter);
@@ -218,26 +244,36 @@ void LLIMChiclet::draw()
 LLIMChiclet::EType LLIMChiclet::getIMSessionType(const LLUUID& session_id)
 {
 	EType				type	= TYPE_UNKNOWN;
-	LLFloaterIMPanel*	im		= NULL;
 
 	if(session_id.isNull())
 		return type;
 
-	if (!(im = LLIMMgr::getInstance()->findFloaterBySession(session_id)))
+	EInstantMessage im_type = LLIMModel::getInstance()->getType(session_id);
+	if (IM_COUNT == im_type)
 	{
 		llassert_always(0 && "IM session not found"); // should never happen
 		return type;
 	}
 
-	switch(im->getDialogType())
+	switch(im_type)
 	{
 	case IM_NOTHING_SPECIAL:
+	case IM_SESSION_P2P_INVITE:
 		type = TYPE_IM;
 		break;
 	case IM_SESSION_GROUP_START:
 	case IM_SESSION_INVITE:
-		type = TYPE_GROUP;
+		if (gAgent.isInGroup(session_id))
+		{
+			type = TYPE_GROUP;
+		}
+		else
+		{
+			type = TYPE_AD_HOC;
+		}
 		break;
+	case IM_SESSION_CONFERENCE_START:
+		type = TYPE_AD_HOC;
 	default:
 		break;
 	}
@@ -259,7 +295,13 @@ LLIMP2PChiclet::Params::Params()
 	rect(LLRect(0, 25, 45, 0));
 
 	avatar_icon.name("avatar_icon");
-	avatar_icon.rect(LLRect(0, 25, 25, 0));
+	avatar_icon.follows.flags(FOLLOWS_LEFT | FOLLOWS_TOP | FOLLOWS_BOTTOM);
+
+	// *NOTE dzaporozhan
+	// Changed icon height from 25 to 24 to fix ticket EXT-794.
+	// In some cases(after changing UI scale) 25 pixel height icon was 
+	// drawn incorrectly, i'm not sure why.
+	avatar_icon.rect(LLRect(0, 24, 25, 0));
 	avatar_icon.mouse_opaque(false);
 
 	unread_notifications.name("unread");
@@ -432,7 +474,12 @@ LLIMGroupChiclet::Params::Params()
 	rect(LLRect(0, 25, 45, 0));
 
 	group_icon.name("group_icon");
-	group_icon.rect(LLRect(0, 25, 25, 0));
+	
+	// *NOTE dzaporozhan
+	// Changed icon height from 25 to 24 to fix ticket EXT-794.
+	// In some cases(after changing UI scale) 25 pixel height icon was 
+	// drawn incorrectly, i'm not sure why.
+	group_icon.rect(LLRect(0, 24, 25, 0));
 
 	unread_notifications.name("unread");
 	unread_notifications.rect(LLRect(25, 25, 45, 0));
@@ -846,6 +893,27 @@ void LLChicletPanel::removeAll()
 	showScrollButtonsIfNeeded();
 }
 
+void LLChicletPanel::scrollToChiclet(const LLChiclet* chiclet)
+{
+	const LLRect& rect = chiclet->getRect();
+
+	if (rect.mLeft < 0)
+	{
+		scroll(llabs(rect.mLeft));
+		showScrollButtonsIfNeeded();
+	}
+	else
+	{
+		S32 scrollWidth = mScrollArea->getRect().getWidth();
+
+		if (rect.mRight > scrollWidth)
+		{
+			scroll(-llabs(rect.mRight - scrollWidth));
+			showScrollButtonsIfNeeded();
+		}
+	}
+}
+
 void LLChicletPanel::reshape(S32 width, S32 height, BOOL called_from_parent )
 {
 	LLPanel::reshape(width,height,called_from_parent);
@@ -861,7 +929,7 @@ void LLChicletPanel::reshape(S32 width, S32 height, BOOL called_from_parent )
 		width, height - scroll_button_rect.getHeight()));
 
 	mScrollArea->setRect(LLRect(scroll_button_rect.getWidth() + SCROLL_BUTTON_PAD,
-		height + 7, width - scroll_button_rect.getWidth() - SCROLL_BUTTON_PAD, 0));
+		height, width - scroll_button_rect.getWidth() - SCROLL_BUTTON_PAD, 0));
 
 	mShowControls = width > mMinWidth;
 	mScrollArea->setVisible(mShowControls);
@@ -1117,6 +1185,7 @@ LLTalkButton::LLTalkButton(const Params& p)
 	speak_params.rect(speak_rect);
 	mSpeakBtn = LLUICtrlFactory::create<LLButton>(speak_params);
 	addChild(mSpeakBtn);
+	LLTransientFloaterMgr::getInstance()->addControlView(mSpeakBtn);
 
 	mSpeakBtn->setClickedCallback(boost::bind(&LLTalkButton::onClick_SpeakBtn, this));
 	mSpeakBtn->setToggleState(FALSE);
@@ -1125,6 +1194,7 @@ LLTalkButton::LLTalkButton(const Params& p)
 	show_params.rect(show_rect);
 	mShowBtn = LLUICtrlFactory::create<LLButton>(show_params);
 	addChild(mShowBtn);
+	LLTransientFloaterMgr::getInstance()->addControlView(mShowBtn);
 
 	mShowBtn->setClickedCallback(boost::bind(&LLTalkButton::onClick_ShowBtn, this));
 	mShowBtn->setToggleState(FALSE);