Merge branch 'sl-base-1.22' into next

Conflicts:
	linden/indra/newview/English.lproj/InfoPlist.strings
	linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml

1 files changed, 4 insertions, 1 deletions

diff --git a/linden/indra/newview/llnotify.h b/linden/indra/newview/llnotify.h
index 95d61eb..a653d19 100644
--- a/linden/indra/newview/llnotify.h
+++ b/linden/indra/newview/llnotify.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -179,6 +179,9 @@ public:
         // Walks the list and removes any stacked messages for which the given matcher returns TRUE.
         // Useful when muting people and things in order to clear out any similar previously queued messages.
         void purgeMessagesMatching(const Matcher& matcher);
+
+private:
+        bool isGroupNotifyBox(const LLView* view) const ;
 };
 
 // This view contains the stack of notification windows.