From bb9a7e54699747f34eced6cedeac5f2904ba8b66 Mon Sep 17 00:00:00 2001 From: Cinders Date: Tue, 5 Mar 2013 23:16:57 -0700 Subject: [PATCH] Add undeform to Avatar Health menu --- indra/newview/llviewermenu.cpp | 15 ++++++++++++++- .../newview/skins/default/xui/en/menu_viewer.xml | 6 ++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 39afaefacb..e34c0bb8a0 100755 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -138,6 +138,7 @@ #include "llvovolume.h" #include "particleeditor.h" #include "piemenu.h" // ## Zi: Pie Menu +#include "fspose.h" // FIRE-4345: Undeform using namespace LLAvatarAppearanceDefines; @@ -8648,7 +8649,18 @@ class FSToolsResyncAnimations : public view_listener_t return true; } }; -// +// Resync Animations + +// FIRE-4345: Undeform +class FSToolsUndeform : public view_listener_t +{ + bool handleEvent(const LLSD& userdata) + { + FSPose::getInstance()->setPose("44e98907-3764-119f-1c13-cba9945d2ff4"); + return true; + } +}; +// FIRE-4345: Undeform class LLToolsSelectOnlyMyObjects : public view_listener_t { @@ -9945,6 +9957,7 @@ void initialize_menus() // FIRE-304: Option to exclude group owned objects view_listener_t::addMenu(new FSToolSelectIncludeGroupOwned(), "Tools.SelectIncludeGroupOwned"); view_listener_t::addMenu(new FSToolsResyncAnimations(), "Tools.ResyncAnimations"); // Resync Animations + view_listener_t::addMenu(new FSToolsUndeform(), "Tools.Undeform"); // FIRE-4345: Undeform view_listener_t::addMenu(new LLToolsEnableToolNotPie(), "Tools.EnableToolNotPie"); view_listener_t::addMenu(new LLToolsEnableSelectNextPart(), "Tools.EnableSelectNextPart"); diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 9c1db6b1ec..0820c17ff5 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -216,6 +216,12 @@ + + +