From 88d9710a8cceaea03c650d0d693e7c59daff3449 Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Mon, 18 Jan 2010 17:10:11 +0200
Subject: Fixed critical bug EXT-4419 ([BSI] pressing enter without local chat
 selected causes warning flood)

--HG--
branch : product-engine
---
 indra/newview/llbottomtray.cpp                      | 6 +++++-
 indra/newview/skins/default/xui/en/alert_button.xml | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp
index fe43ab7084..9b215e4096 100644
--- a/indra/newview/llbottomtray.cpp
+++ b/indra/newview/llbottomtray.cpp
@@ -48,6 +48,7 @@
 #include "llsyswellwindow.h"
 #include "llfloatercamera.h"
 #include "lltexteditor.h"
+#include "llnotifications.h"
 
 // Build time optimization, generate extern template once in .cpp file
 template class LLBottomTray* LLSingleton<class LLBottomTray>::getInstance();
@@ -1106,7 +1107,10 @@ void LLBottomTray::setTrayButtonVisibleIfPossible(EResizeState shown_object_type
 		// mark this button to show it while future bottom tray extending
 		mResizeState |= shown_object_type;
 		if ( raise_notification )
-			LLNotificationsUtil::add("BottomTrayButtonCanNotBeShown");
+			LLNotificationsUtil::add("BottomTrayButtonCanNotBeShown",
+									 LLSD(),
+									 LLSD(),
+									 LLNotificationFunctorRegistry::instance().DONOTHING);
 	}
 }
 
diff --git a/indra/newview/skins/default/xui/en/alert_button.xml b/indra/newview/skins/default/xui/en/alert_button.xml
index 48c67a3770..632564d793 100644
--- a/indra/newview/skins/default/xui/en/alert_button.xml
+++ b/indra/newview/skins/default/xui/en/alert_button.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 
 <button
+  name="Alert Button"
   label_shadow="true"
   auto_resize="false"
   image_overlay_alignment="center"
-- 
cgit v1.2.3