From a5a5beea1dcb6751940eaba817d291980b6c8b1a Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Tue, 1 Mar 2011 05:03:36 +0100 Subject: [PATCH] Pose stand removed by Beeks' request --- indra/newview/llviewermenu.cpp | 106 ++++++++++++++------------------- 1 file changed, 44 insertions(+), 62 deletions(-) diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 9ab09b6cf..63c13309f 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -426,13 +426,46 @@ void handle_leave_god_mode(void*); // void handle_fake_away_status(void*); void handle_area_search(void*); -void handle_pose_stand_ltao(void*); -void handle_pose_stand_ltah(void*); -void handle_pose_stand_ltad(void*); -void handle_pose_stand_loau(void*); -void handle_pose_stand_loao(void*); -void handle_pose_stand_lhao(void*); -void handle_pose_stand_stop(void*); + +// for pose stand +LLUUID current_pose = LLUUID::null; + +void set_current_pose(std::string anim) +{ + if (current_pose == LLUUID::null) + gSavedSettings.setF32("AscentAvatarZModifier", gSavedSettings.getF32("AscentAvatarZModifier") + 7.5); + + gAgent.sendAgentSetAppearance(); + gAgent.sendAnimationRequest(current_pose, ANIM_REQUEST_STOP); + current_pose.set(anim); + gAgent.sendAnimationRequest(current_pose, ANIM_REQUEST_START); +} +void handle_pose_stand(void*) +{ + set_current_pose("038fcec9-5ebd-8a8e-0e2e-6e71a0a1ac53"); +} +void handle_pose_stand_stop(void*) +{ + if (current_pose != LLUUID::null) + { + gSavedSettings.setF32("AscentAvatarZModifier", gSavedSettings.getF32("AscentAvatarZModifier") - 7.5); + gAgent.sendAgentSetAppearance(); + gAgent.sendAnimationRequest(current_pose, ANIM_REQUEST_STOP); + current_pose = LLUUID::null; + } +} + +void handle_toggle_pose(void* userdata) { + if(current_pose.isNull()) + handle_pose_stand(userdata); + else + handle_pose_stand_stop(userdata); +} + +BOOL handle_check_pose(void* userdata) { + return current_pose.notNull(); +} + void handle_force_ground_sit(void*); void handle_phantom_avatar(void*); @@ -570,9 +603,6 @@ BOOL enable_region_owner(void*); void menu_toggle_attached_lights(void* user_data); void menu_toggle_attached_particles(void* user_data); -// for pose stand -LLUUID current_pose = LLUUID::null; - class LLMenuParcelObserver : public LLParcelObserver { public: @@ -794,7 +824,7 @@ void init_menus() // // Add in the pose stand ------------------------------------------- - LLMenuGL* sub = new LLMenuGL("Pose Stand..."); + /*LLMenuGL* sub = new LLMenuGL("Pose Stand..."); menu->appendMenu(sub); sub->append(new LLMenuItemCallGL( "Legs Together Arms Out", &handle_pose_stand_ltao, NULL)); @@ -804,7 +834,9 @@ void init_menus() sub->append(new LLMenuItemCallGL( "Legs Out Arms Out", &handle_pose_stand_loao, NULL)); sub->append(new LLMenuItemCallGL( "Legs Half Arms Out", &handle_pose_stand_lhao, NULL)); sub->append(new LLMenuItemCallGL( "Stop Pose Stand", &handle_pose_stand_stop, NULL)); - // ------------------------------------------------------ + // ------------------------------------------------------*/ + + menu->append(new LLMenuItemCheckGL("Pose Stand",&handle_toggle_pose, NULL, &handle_check_pose, NULL)); //these should always be last in a sub menu menu->createJumpKeys(); @@ -3649,56 +3681,6 @@ void handle_close_all_notifications(void*) } } -// -// The following animations were made by Charley Levenque and are -// not public property or free to use via UUID. When replicating -// this code, please supply your own animations. - -void set_current_pose(std::string anim) -{ - if (current_pose == LLUUID::null) - gSavedSettings.setF32("AscentAvatarZModifier", gSavedSettings.getF32("AscentAvatarZModifier") + 7.5); - - gAgent.sendAgentSetAppearance(); - gAgent.sendAnimationRequest(current_pose, ANIM_REQUEST_STOP); - current_pose.set(anim); - gAgent.sendAnimationRequest(current_pose, ANIM_REQUEST_START); -} -void handle_pose_stand_ltao(void*) -{ - set_current_pose("6c082c7b-f70e-9da0-0451-54793f869ff4"); -} -void handle_pose_stand_ltah(void*) -{ - set_current_pose("45e59c14-913b-c58c-2a55-c0a5c1eeef53"); -} -void handle_pose_stand_ltad(void*) -{ - set_current_pose("421d6bb4-94a9-3c42-4593-f2bc1f6a26e6"); -} -void handle_pose_stand_loau(void*) -{ - set_current_pose("8b3bb239-d610-1c0f-4d1a-69d29bc17e2c"); -} -void handle_pose_stand_loao(void*) -{ - set_current_pose("4d70e328-48b6-dc6a-0be1-85dd6b333e81"); -} -void handle_pose_stand_lhao(void*) -{ - set_current_pose("f088eaf0-f1c9-8cf1-99c8-09df96bb13ae"); -} -void handle_pose_stand_stop(void*) -{ - if (current_pose != LLUUID::null) - { - gSavedSettings.setF32("AscentAvatarZModifier", gSavedSettings.getF32("AscentAvatarZModifier") - 7.5); - gAgent.sendAgentSetAppearance(); - gAgent.sendAnimationRequest(current_pose, ANIM_REQUEST_STOP); - current_pose = LLUUID::null; - } -} -// --------------------------------------------------- void handle_area_search(void*) { JCFloaterAreaSearch::toggle();