remove a wad of the experimental evil deadcode that I added while hacking.

4 files changed, 1 insertions, 197 deletions

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 300103929b..c439781175 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -309,7 +309,6 @@ set(viewer_SOURCE_FILES
     llnotificationmanager.cpp
     llnotificationofferhandler.cpp
     llnotificationscripthandler.cpp
-    llnotificationscripttextboxhandler.cpp
     llnotificationstorage.cpp
     llnotificationtiphandler.cpp
     lloutfitslist.cpp
diff --git a/indra/newview/llnotificationhandler.h b/indra/newview/llnotificationhandler.h
index a9ae2bd21f..28a69f2373 100644
--- a/indra/newview/llnotificationhandler.h
+++ b/indra/newview/llnotificationhandler.h
@@ -197,29 +197,9 @@ protected:
 	virtual void initChannel();
 
 	// own handlers
-	virtual void onRejectToast(LLUUID& id);
+	void onRejectToast(LLUUID& id);
 };
 
-/**
- * Handler for specific textbox-based script notices.
- */
-
-class LLScriptTextboxHandler : public LLSysHandler
-{
- public:
-	LLScriptTextboxHandler(e_notification_type type, const LLSD& id);
-	virtual ~LLScriptTextboxHandler();
-
-	// base interface functions
-	virtual bool processNotification(const LLSD& notify);
-
-protected:
-	virtual void onDeleteToast(LLToast* toast);
-	virtual void initChannel();
-
-	// own handlers
-	virtual void onRejectToast(LLUUID& id);
-};
 
 /**
  * Handler for group system notices.
diff --git a/indra/newview/llnotificationmanager.cpp b/indra/newview/llnotificationmanager.cpp
index 3967117fc8..6988227128 100644
--- a/indra/newview/llnotificationmanager.cpp
+++ b/indra/newview/llnotificationmanager.cpp
@@ -74,7 +74,6 @@ void LLNotificationManager::init()
 	LLNotifications::instance().getChannel("Browser")->connectChanged(boost::bind(&LLBrowserNotification::processNotification, LLBrowserNotification::getInstance(), _1));
 
 	mNotifyHandlers["notify"] = boost::shared_ptr<LLEventHandler>(new LLScriptHandler(NT_NOTIFY, LLSD()));
-	//mNotifyHandlers["notify"] = boost::shared_ptr<LLEventHandler>(new LLScriptTextboxHandler(NT_NOTIFY, LLSD()));
 	mNotifyHandlers["notifytip"] =  boost::shared_ptr<LLEventHandler>(new LLTipHandler(NT_NOTIFY, LLSD()));
 	mNotifyHandlers["groupnotify"] = boost::shared_ptr<LLEventHandler>(new LLGroupHandler(NT_GROUPNOTIFY, LLSD()));
 	mNotifyHandlers["alert"] = boost::shared_ptr<LLEventHandler>(new LLAlertHandler(NT_ALERT, LLSD()));
diff --git a/indra/newview/llnotificationscripttextboxhandler.cpp b/indra/newview/llnotificationscripttextboxhandler.cpp
deleted file mode 100644
index 9556501c42..0000000000
--- a/indra/newview/llnotificationscripttextboxhandler.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-/** 
- * @file llnotificationscripthandler.cpp
- * @brief Notification Handler Class for Simple Notifications and Notification Tips
- *
- * $LicenseInfo:firstyear=2000&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-
-#include "llviewerprecompiledheaders.h" // must be first include
-
-#include "llnotificationhandler.h"
-#include "lltoastnotifypanel.h"
-#include "llviewercontrol.h"
-#include "llviewerwindow.h"
-#include "llnotificationmanager.h"
-#include "llnotifications.h"
-#include "llscriptfloater.h"
-#include "lltoastscripttextbox.h"
-
-using namespace LLNotificationsUI;
-
-static const std::string SCRIPT_DIALOG				("ScriptDialog");
-static const std::string SCRIPT_DIALOG_GROUP		("ScriptDialogGroup");
-static const std::string SCRIPT_LOAD_URL			("LoadWebPage");
-
-//--------------------------------------------------------------------------
-LLScriptTextboxHandler::LLScriptTextboxHandler(e_notification_type type, const LLSD& id)
-{
-	mType = type;
-
-	// Getting a Channel for our notifications
-	mChannel = LLChannelManager::getInstance()->createNotificationChannel();
-	mChannel->setControlHovering(true);
-	
-	LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel);
-	if(channel)
-		channel->setOnRejectToastCallback(boost::bind(&LLScriptTextboxHandler::onRejectToast, this, _1));
-
-}
-
-//--------------------------------------------------------------------------
-LLScriptTextboxHandler::~LLScriptTextboxHandler()
-{
-}
-
-//--------------------------------------------------------------------------
-void LLScriptTextboxHandler::initChannel()
-{
-	S32 channel_right_bound = gViewerWindow->getWorldViewRectScaled().mRight - gSavedSettings.getS32("NotificationChannelRightMargin"); 
-	S32 channel_width = gSavedSettings.getS32("NotifyBoxWidth");
-	mChannel->init(channel_right_bound - channel_width, channel_right_bound);
-}
-
-//--------------------------------------------------------------------------
-bool LLScriptTextboxHandler::processNotification(const LLSD& notify)
-{
-	if(!mChannel)
-	{
-		return false;
-	}
-
-	LLNotificationPtr notification = LLNotifications::instance().find(notify["id"].asUUID());
-
-	if(!notification)
-		return false;
-
-	// arrange a channel on a screen
-	if(!mChannel->getVisible())
-	{
-		initChannel();
-	}
-	
-	if(notify["sigtype"].asString() == "add" || notify["sigtype"].asString() == "change")
-	{
-		if (LLHandlerUtil::canLogToIM(notification))
-		{
-			LLHandlerUtil::logToIMP2P(notification);
-		}
-
-		if(0)//(SCRIPT_DIALOG == notification->getName() || SCRIPT_DIALOG_GROUP == notification->getName() || SCRIPT_LOAD_URL == notification->getName())
-		{
-			LLScriptFloaterManager::getInstance()->onAddNotification(notification->getID());
-		}
-		else
-		{
-			LLToastScriptTextbox* notify_box = new LLToastScriptTextbox(notification);
-
-			LLToast::Params p;
-			p.notif_id = notification->getID();
-			p.notification = notification;
-			p.panel = notify_box;	
-			p.on_delete_toast = boost::bind(&LLScriptTextboxHandler::onDeleteToast, this, _1);
-
-			LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel);
-			if(channel)
-			{
-				channel->addToast(p);
-			}
-
-			// send a signal to the counter manager
-			mNewNotificationSignal();
-		}
-	}
-	else if (notify["sigtype"].asString() == "delete")
-	{
-		if(SCRIPT_DIALOG == notification->getName() || SCRIPT_DIALOG_GROUP == notification->getName() || SCRIPT_LOAD_URL == notification->getName())
-		{
-			LLScriptFloaterManager::getInstance()->onRemoveNotification(notification->getID());
-		}
-		else
-		{
-			mChannel->killToastByNotificationID(notification->getID());
-		}
-	}
-	return false;
-}
-
-//--------------------------------------------------------------------------
-
-void LLScriptTextboxHandler::onDeleteToast(LLToast* toast)
-{
-	// send a signal to the counter manager
-	mDelNotificationSignal();
-
-	// send a signal to a listener to let him perform some action
-	// in this case listener is a SysWellWindow and it will remove a corresponding item from its list
-	mNotificationIDSignal(toast->getNotificationID());
-
-	LLNotificationPtr notification = LLNotifications::getInstance()->find(toast->getNotificationID());
-	
-	if( notification && 
-		(SCRIPT_DIALOG == notification->getName() || SCRIPT_DIALOG_GROUP == notification->getName()) )
-	{
-		LLScriptFloaterManager::getInstance()->onRemoveNotification(notification->getID());
-	}
-}
-
-//--------------------------------------------------------------------------
-void LLScriptTextboxHandler::onRejectToast(LLUUID& id)
-{
-	LLNotificationPtr notification = LLNotifications::instance().find(id);
-
-	if (notification
-			&& LLNotificationManager::getInstance()->getHandlerForNotification(
-					notification->getType()) == this)
-	{
-		LLNotifications::instance().cancel(notification);
-	}
-}
-
-//--------------------------------------------------------------------------
-
-
-
-