From 70d5b72316c3885b6224352e5512105229d7f8ff Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sun, 23 May 2010 22:24:31 -0700
Subject: Fixed missing Notification Console menu entry from Advanced >
 Consoles

---
 linden/indra/newview/llviewermenu.cpp                        | 6 +++++-
 linden/indra/newview/llviewerwindow.cpp                      | 2 +-
 linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 9 ++++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index b4b5532..3adab3c 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -760,7 +760,6 @@ void init_client_menu(LLMenuGL* menu)
 		
 		sub->appendSeparator();
 		
-		// For Imprudence 1.3 - need to XUIfy
 		// Debugging view for unified notifications
 		sub->append(new LLMenuItemCallGL("Notifications Console...",
 						 &handle_show_notifications_console, NULL, NULL, '5', MASK_CONTROL|MASK_SHIFT ));
@@ -8423,6 +8422,11 @@ class LLAdvancedToggleConsole : public view_listener_t
 		{
 			toggle_visibility( (void*)gDebugView->mMemoryView );
 		}
+		else if ("notifications" == console_type)
+		{
+			// Don't find the instance, it'll force it to show on login screen -- MC
+			LLFloaterNotificationConsole::toggleInstance();
+		}
 		return true;
 	}
 };
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 340d7a3..047f198 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -2194,7 +2194,7 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
 	    && (MASK_CONTROL & mask)
 	    && ('5' == key))
 	{
-		LLFloaterNotificationConsole::showInstance();
+		LLFloaterNotificationConsole::toggleInstance();
 		return TRUE;
 	}
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 27b709b..d5d21fb 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -879,6 +879,12 @@
       </menu_item_check>
       -->
       <menu_item_separator />
+      <menu_item_call name="Notifications Console..." label="Notifications Console..."
+                       shortcut="control|shift|5">
+        <on_click function="Advanced.ToggleConsole"
+                  userdata="notifications" />
+      </menu_item_call>
+      <menu_item_separator />
       <menu_item_call name="Region Info to Debug Console"
                       label="Region Info to Debug Console">
         <on_click function="Advanced.DumpInfoToConsole"
@@ -894,7 +900,8 @@
         <on_click function="Advanced.DumpInfoToConsole"
                   userdata="capabilities" />
       </menu_item_call>
-    </menu>
+    
+  </menu>
 
 
     <menu_item_call name="Reload personal setting overrides"
-- 
cgit v1.1