svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3

EXT-65 EXT-270 EXT-359 EXT-361 EXT-367 EXT-367 EXT-368 EXT-455 EXT-468 EXT-530 EXT-539 EXT-540 EXT-542 EXT-545 EXT-555 EXT-557 EXT-558 EXT-559 EXT-559 EXT-560 EXT-561 EXT-562 EXT-563 EXT-564 EXT-566 EXT-568 EXT-569 EXT-570 EXT-571 EXT-581 EXT-590 EXT-594 EXT-596 EXT-597 EXT-601 EXT-602 EXT-603 EXT-613 EXT-620 EXT-624 EXT-628 EXT-630 EXT-631 EXT-632 EXT-639 EXT-640 EXT-641 EXT-642 EXT-662 EXT-671 EXT-672 EXT-676 EXT-682 EXT-692 EXT-703 EXT-717

1 files changed, 127 insertions, 0 deletions

diff --git a/indra/newview/llimhandler.cpp b/indra/newview/llimhandler.cpp
new file mode 100644
index 0000000000..0262e40803
--- /dev/null
+++ b/indra/newview/llimhandler.cpp
@@ -0,0 +1,127 @@
+/** 
+ * @file llimhandler.cpp
+ * @brief Notification Handler Class for IM notifications
+ *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
+ * Copyright (c) 2000-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+
+#include "llviewerprecompiledheaders.h" // must be first include
+
+#include "llnotificationhandler.h"
+
+#include "llbottomtray.h"
+#include "llviewercontrol.h"
+#include "lltoastimpanel.h"
+
+using namespace LLNotificationsUI;
+
+//--------------------------------------------------------------------------
+LLIMHandler::LLIMHandler()
+{
+	
+	// getting a Chiclet and creating params for a channel
+	LLBottomTray* tray = LLBottomTray::getInstance();
+	mChiclet = tray->getSysWell();
+
+	LLChannelManager::Params p;
+	// *TODO: createNotificationChannel method
+	p.id = LLUUID(gSavedSettings.getString("NotificationChannelUUID"));
+	p.channel_right_bound = tray->getRect().mRight - gSavedSettings.getS32("NotificationChannelRightMargin"); 
+	p.channel_width = gSavedSettings.getS32("NotifyBoxWidth");
+
+	// Getting a Channel for our notifications
+	mChannel = LLChannelManager::getInstance()->createChannel(p);
+
+}
+
+//--------------------------------------------------------------------------
+LLIMHandler::~LLIMHandler()
+{
+}
+
+//--------------------------------------------------------------------------
+void LLIMHandler::processNotification(const LLSD& notify)
+{
+	LLNotificationPtr notification = LLNotifications::instance().find(notify["id"].asUUID());
+
+	if(!notification)
+		return;
+
+	if(notify["sigtype"].asString() == "add" || notify["sigtype"].asString() == "change")
+	{
+		LLSD substitutions = notification->getSubstitutions();
+
+		LLToastIMPanel::Params im_p;
+		im_p.notification = notification;
+		im_p.avatar_id = substitutions["FROM_ID"].asUUID();
+		im_p.from = substitutions["FROM"].asString();
+		im_p.time = substitutions["TIME"].asString();
+		im_p.message = substitutions["MESSAGE"].asString();
+		im_p.session_id = substitutions["SESSION_ID"].asUUID();
+
+		LLToastIMPanel* im_box = new LLToastIMPanel(im_p);
+
+		LLToast::Params p;
+		p.id = notification->getID();
+		p.notification = notification;
+		p.panel = im_box;
+		p.can_be_stored = false;
+		p.on_toast_destroy = boost::bind(&LLIMHandler::onToastDestroy, this, _1);
+		mChannel->addToast(p);
+
+
+		static_cast<LLNotificationChiclet*>(mChiclet)->updateUreadIMNotifications();
+	}
+	else if (notify["sigtype"].asString() == "delete")
+	{
+		mChannel->killToastByNotificationID(notification->getID());
+	}
+}
+
+//--------------------------------------------------------------------------
+void LLIMHandler::onToastDestroy(LLToast* toast)
+{
+	toast->closeFloater();
+	static_cast<LLNotificationChiclet*>(mChiclet)->updateUreadIMNotifications();
+}
+
+//--------------------------------------------------------------------------
+void LLIMHandler::onChicletClick(void)
+{
+}
+
+//--------------------------------------------------------------------------
+void LLIMHandler::onChicletClose(void)
+{
+}
+
+//--------------------------------------------------------------------------
+
+
+