2 files changed, 67 insertions, 0 deletions

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index a0d3574..a71240d 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -10369,8 +10369,42 @@ class LLAdvancedDumpAvatarLocalTextures : public view_listener_t
         }
 };
 
+///////////
+// Crash //
+///////////
 
 
+class LLAdvancedCrash : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                std::string command = userdata.asString();
+                if ("deadbeefcrash" == command)
+                {
+                        force_error_bad_memory_access(NULL);
+                }
+                else if ("llerrcrash" == command)
+                {
+                        force_error_llerror(NULL);
+                }
+                else if ("infiniteloopcrash" == command)
+                {
+                        force_error_infinite_loop(NULL);
+                }
+                else if ("drivercrash" == command)
+                {
+                        force_error_driver_crash(NULL);
+                }
+                else if ("forcedisconnect" == command)
+                {
+                        handle_disconnect_viewer(NULL);
+                }
+
+                return true;
+        }
+
+};
+
 /////////////////
 // MESSAGE LOG //
 /////////////////
@@ -11087,6 +11121,10 @@ void initialize_menus()
         addMenu(new LLAdvancedDebugAvatarTextures(), "Advanced.DebugAvatarTextures");
         addMenu(new LLAdvancedDumpAvatarLocalTextures(), "Advanced.DumpAvatarLocalTextures");
 
+        // Advanced > Crash
+        addMenu(new LLAdvancedCrash(), "Advanced.Crash");
+
+
         // Advanced > Network
         addMenu(new LLAdvancedEnableMessageLog(), "Advanced.EnableMessageLog");
         addMenu(new LLAdvancedDisableMessageLog(), "Advanced.DisableMessageLog");
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 425e2d4..00723cd 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
@@ -1920,7 +1920,36 @@
       </menu_item_call>
     </menu>
 
+    <!-- CRASH -->
 
+    <menu name="Crash" drop_shadow="true"
+          opaque="true" tear_off="true">
+      <menu_item_call name="Force Bad Memory Access"
+                      label="Force Bad Memory Access">
+        <on_click function="Advanced.Crash"
+                  userdata="deadbeefcrash" />
+      </menu_item_call>
+      <menu_item_call name="Force LLError And Crash"
+                      label="Force LLError And Crash">
+        <on_click function="Advanced.Crash"
+                  userdata="llerrcrash" />
+      </menu_item_call>
+      <menu_item_call name="Force Infinite Loop"
+                      label="Force Infinite Loop">
+        <on_click function="Advanced.Crash"
+                  userdata="infiniteloopcrash" />
+      </menu_item_call>
+      <menu_item_call name="Force Driver Crash"
+                      label="Force Driver Crash">
+        <on_click function="Advanced.Crash"
+                  userdata="drivercrash" />
+      </menu_item_call>
+      <menu_item_call name="Force Disconnect Viewer"
+                      label="Force Disconnect Viewer">
+        <on_click function="Advanced.Crash"
+                  userdata="forcedisconnect" />
+      </menu_item_call>
+    </menu>
 
     <!-- NETWORK -->