aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2009-01-28 20:04:52 -0600
committerJacek Antonelli2009-01-28 20:05:02 -0600
commit0ef11cf31364456ec247b0fc7ad8f6d1de408400 (patch)
tree50754b286468147a70271253a2a74215c80e1354 /linden/indra/newview/llviewermenu.cpp
parentSecond Life viewer sources 1.22.5-RC (diff)
downloadmeta-impy-0ef11cf31364456ec247b0fc7ad8f6d1de408400.zip
meta-impy-0ef11cf31364456ec247b0fc7ad8f6d1de408400.tar.gz
meta-impy-0ef11cf31364456ec247b0fc7ad8f6d1de408400.tar.bz2
meta-impy-0ef11cf31364456ec247b0fc7ad8f6d1de408400.tar.xz
Second Life viewer sources 1.22.6-RC
Diffstat (limited to 'linden/indra/newview/llviewermenu.cpp')
-rw-r--r--linden/indra/newview/llviewermenu.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 2d64712..023c758 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -403,6 +403,7 @@ void force_error_llerror(void *);
403void force_error_bad_memory_access(void *); 403void force_error_bad_memory_access(void *);
404void force_error_infinite_loop(void *); 404void force_error_infinite_loop(void *);
405void force_error_software_exception(void *); 405void force_error_software_exception(void *);
406void force_error_driver_crash(void *);
406 407
407void handle_stopall(void*); 408void handle_stopall(void*);
408//void handle_hinge(void*); 409//void handle_hinge(void*);
@@ -936,6 +937,7 @@ void init_client_menu(LLMenuGL* menu)
936 sub->append(new LLMenuItemCallGL("Force LLError And Crash", &force_error_llerror)); 937 sub->append(new LLMenuItemCallGL("Force LLError And Crash", &force_error_llerror));
937 sub->append(new LLMenuItemCallGL("Force Bad Memory Access", &force_error_bad_memory_access)); 938 sub->append(new LLMenuItemCallGL("Force Bad Memory Access", &force_error_bad_memory_access));
938 sub->append(new LLMenuItemCallGL("Force Infinite Loop", &force_error_infinite_loop)); 939 sub->append(new LLMenuItemCallGL("Force Infinite Loop", &force_error_infinite_loop));
940 sub->append(new LLMenuItemCallGL("Force Driver Crash", &force_error_driver_crash));
939 sub->append(new LLMenuItemCallGL("Force Disconnect Viewer", &handle_disconnect_viewer)); 941 sub->append(new LLMenuItemCallGL("Force Disconnect Viewer", &handle_disconnect_viewer));
940 // *NOTE:Mani this isn't handled yet... sub->append(new LLMenuItemCallGL("Force Software Exception", &force_error_unhandled_exception)); 942 // *NOTE:Mani this isn't handled yet... sub->append(new LLMenuItemCallGL("Force Software Exception", &force_error_unhandled_exception));
941 sub->createJumpKeys(); 943 sub->createJumpKeys();
@@ -6921,6 +6923,11 @@ void force_error_software_exception(void *)
6921 LLAppViewer::instance()->forceErrorSoftwareException(); 6923 LLAppViewer::instance()->forceErrorSoftwareException();
6922} 6924}
6923 6925
6926void force_error_driver_crash(void *)
6927{
6928 LLAppViewer::instance()->forceErrorDriverCrash();
6929}
6930
6924class LLToolsUseSelectionForGrid : public view_listener_t 6931class LLToolsUseSelectionForGrid : public view_listener_t
6925{ 6932{
6926 bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) 6933 bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)