aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2009-05-24 02:59:02 -0500
committerJacek Antonelli2009-05-24 02:59:08 -0500
commit811454f47ea1f3c5cb8971f0fed0959b18bd0747 (patch)
tree1b8689df2dc8857cdc5a956a5233d5bf94b5c8d7 /linden/indra/newview/llviewermenu.cpp
parentSecond Life viewer sources 1.23.0-RC (diff)
downloadmeta-impy-811454f47ea1f3c5cb8971f0fed0959b18bd0747.zip
meta-impy-811454f47ea1f3c5cb8971f0fed0959b18bd0747.tar.gz
meta-impy-811454f47ea1f3c5cb8971f0fed0959b18bd0747.tar.bz2
meta-impy-811454f47ea1f3c5cb8971f0fed0959b18bd0747.tar.xz
Second Life viewer sources 1.23.1-RC
Diffstat (limited to 'linden/indra/newview/llviewermenu.cpp')
-rw-r--r--linden/indra/newview/llviewermenu.cpp17
1 files changed, 17 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 26a8c02..85ca5d0 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -212,6 +212,7 @@
212#include "llwlanimator.h" 212#include "llwlanimator.h"
213#include "llwlparammanager.h" 213#include "llwlparammanager.h"
214#include "llwaterparammanager.h" 214#include "llwaterparammanager.h"
215#include "llfloaternotificationsconsole.h"
215 216
216#include "lltexlayer.h" 217#include "lltexlayer.h"
217 218
@@ -297,6 +298,8 @@ void handle_dump_group_info(void *);
297void handle_dump_capabilities_info(void *); 298void handle_dump_capabilities_info(void *);
298void handle_dump_focus(void*); 299void handle_dump_focus(void*);
299 300
301// Advanced->Consoles menu
302void handle_show_notifications_console(void*);
300void handle_region_dump_settings(void*); 303void handle_region_dump_settings(void*);
301void handle_region_dump_temp_asset_data(void*); 304void handle_region_dump_temp_asset_data(void*);
302void handle_region_clear_temp_asset_data(void*); 305void handle_region_clear_temp_asset_data(void*);
@@ -746,7 +749,16 @@ void init_client_menu(LLMenuGL* menu)
746 (void*)gDebugView->mMemoryView, 749 (void*)gDebugView->mMemoryView,
747 '0', MASK_CONTROL|MASK_SHIFT ) ); 750 '0', MASK_CONTROL|MASK_SHIFT ) );
748#endif 751#endif
752
753 sub->appendSeparator();
754
755 // Debugging view for unified notifications
756 sub->append(new LLMenuItemCallGL("Notifications Console...",
757 &handle_show_notifications_console, NULL, NULL, '5', MASK_CONTROL|MASK_SHIFT ));
758
759
749 sub->appendSeparator(); 760 sub->appendSeparator();
761
750 sub->append(new LLMenuItemCallGL("Region Info to Debug Console", 762 sub->append(new LLMenuItemCallGL("Region Info to Debug Console",
751 &handle_region_dump_settings, NULL)); 763 &handle_region_dump_settings, NULL));
752 sub->append(new LLMenuItemCallGL("Group Info to Debug Console", 764 sub->append(new LLMenuItemCallGL("Group Info to Debug Console",
@@ -2601,6 +2613,11 @@ void handle_region_dump_settings(void*)
2601 } 2613 }
2602} 2614}
2603 2615
2616void handle_show_notifications_console(void *)
2617{
2618 LLFloaterNotificationConsole::showInstance();
2619}
2620
2604void handle_dump_group_info(void *) 2621void handle_dump_group_info(void *)
2605{ 2622{
2606 llinfos << "group " << gAgent.mGroupName << llendl; 2623 llinfos << "group " << gAgent.mGroupName << llendl;