diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index 627cb049b3..73740b0c6d 100644 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -198,9 +198,9 @@ label_ref="Command_Poser_Label" tooltip_ref="Command_Poser_Tooltip" execute_function="Floater.ToggleOrBringToFront" - execute_parameters="poser" + execute_parameters="fs_poser" is_running_function="Floater.IsOpen" - is_running_parameters="poser" + is_running_parameters="fs_poser" /> ); LLFloaterReg::add("perms_default", "floater_perms_default.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); LLFloaterReg::add("places", "floater_places.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); - LLFloaterReg::add("poser", "floater_poser.xml", (LLFloaterBuildFunc) &LLFloaterReg::build); // [FIRE-30873]: Poser LLFloaterReg::add("preferences", "floater_preferences.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); // LLFloaterReg::add("prefs_graphics_advanced", "floater_preferences_graphics_advanced.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); LLFloaterReg::add("prefs_view_advanced", "floater_preferences_view_advanced.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); @@ -637,6 +636,7 @@ void LLViewerFloaterReg::registerFloaters() LLFloaterReg::add("fs_posestand", "floater_fs_posestand.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); LLFloaterReg::add("fs_partial_inventory", "floater_fs_partial_inventory.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); LLFloaterReg::add("fs_placedetails", "floater_fs_placedetails.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); + LLFloaterReg::add("fs_poser", "floater_fs_poser.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); // [FIRE-30873]: Poser LLFloaterReg::add("fs_protectedfolders", "floater_fs_protectedfolders.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); LLFloaterReg::add("fs_radar", "floater_fs_radar.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); LLFloaterReg::add("fs_streamtitle", "floater_fs_streamtitle.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); diff --git a/indra/newview/skins/default/xui/de/floater_fs_poser.xml b/indra/newview/skins/default/xui/de/floater_fs_poser.xml new file mode 100644 index 0000000000..a1740e394a --- /dev/null +++ b/indra/newview/skins/default/xui/de/floater_fs_poser.xml @@ -0,0 +1,285 @@ + + + + Körper + Stirn/Augenbrauen + Augen/Augenlider + Wangen/Lippen + Linke Hand + Linker Arm + Rechte Hand + Rechter Arm + Beine + Schwanz + Hintere Glieder + Flügel + + + Ganzer Avatar + Oberkörper + Brust + Hals + Kopf + Rechtes Auge + Linkes Auge + Linker Stirnwinkel + Rechter Stirnwinkel + Äuß. linke Augenbraue + Mit. linke Augenbraue + In. linke Augenbraue + Äuß. rechte Augenbraue + Mit. rechte Augenbraue + In. rechte Augenbraue + Linkes oberes Augenlid + Linkes unteres Augenlid + Rechtes oberes Augenlid + Linkes unteres Augenlid + Linkes oberes Ohr + Linkes unteres Ohr + Rechtes oberes Ohr + Rechtes unteres Ohr + Nase links + Nase Mitte + Nase rechts + Linke obere Wange + Linke untere Wange + Rechte oberes Wange + Rechte untere Wange + Kiefer + Zähne unten + Linke untere Lippe + Rechte untere Lippe + Mittlere untere Lippe + Zunge Basis + Zungenspite + Kieferform + Stirn Mitte + Nase Basis + Obere Zähne + Linke obere Lippe + Rechte obere Lippe + Linker Mundwinkel + Rechter Mundwinkel + Mittlere obere Lippe + In. linker Augenwinkel + In. rechter Augenwinkel + Nasenbrücke + Kragen + Ganzer Arm + Unterarm + Handgelenk + Basis Mittelfinger + Mitte Mittelfinger + Spitze Mittelfinger + Basis Zeigefinger + Mitte Zeigefinger + Spitze Zeigefinger + Basis Ringfinger + Mitte Ringfinger + Spitze Ringfinger + Basis kleiner Finger + Mitte kleiner Finger + Spitze kleiner Finger + Basis Daumen + Mitte Daumen + Spitze Daumen + Kragen + Ganzer Arm + Unterarm + Handgelenk + Basis Mittelfinger + Mitte Mittelfinger + Spitze Mittelfinger + Basis Zeigefinger + Mitte Zeigefinger + Spitze Zeigefinger + Basis Ringfinger + Mitte Ringfinger + Spitze Ringfinger + Basis kleiner Finger + Mitte kleiner Finger + Spitze kleiner Finger + Basis Daumen + Mitte Daumen + Spitze Daumen + Wurzel + Links 1 + Links 2 + Links 3 + Links 4 + Linker Fächer + Rechts 1 + Rechts 2 + Rechts 3 + Rechts 4 + Rechter Fächer + Rechte Hüfte + Rechtes Knie + Rechter Knöchel + Rechter Fuß + Rechter Zeh + Linke Hüfte + Linkes Knie + Linker Knöchel + Linker Fuß + Linker Zeh + Basis Schwanz + Schwanz 2 + Schwanz 3 + Schwanz 4 + Schwanz 5 + Schwanz-Spitze + Leiste + Wurzel + Linke Basis + Links 2 + Links 3 + Links 4 + Rechte Basis + Rechts 2 + Rechts 3 + Rechts 4 + Hintern + Bauch + Linke Brustmuskeln + Rechte Brustmuskeln + + + + + + + + + + + + + + + Hoch/Runter: + + + + Links/Rechts: + + + + Hinein/Heraus: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Rotation: + + + + + + + + + + Up/Down: + + Left/Right: + + Roll: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/indra/newview/skins/default/xui/en/floater_poser.xml b/indra/newview/skins/default/xui/en/floater_poser.xml deleted file mode 100644 index 05d17f4966..0000000000 --- a/indra/newview/skins/default/xui/en/floater_poser.xml +++ /dev/null @@ -1,1499 +0,0 @@ - - - Inv_BodyShape - - Inv_Object - - - - - - SWAP_YAW_AND_ROLL NEGATE_PITCH - SWAP_YAW_AND_ROLL NEGATE_PITCH - SWAP_YAW_AND_ROLL NEGATE_PITCH - SWAP_YAW_AND_ROLL NEGATE_PITCH - SWAP_YAW_AND_ROLL NEGATE_PITCH - NEGATE_PITCH - SWAP_ROLL_AND_PITCH NEGATE_ROLL - SWAP_ROLL_AND_PITCH NEGATE_ROLL - SWAP_X2Y_Y2Z_Z2X NEGATE_PITCH NEGATE_YAW - SWAP_X2Z_Y2X_Z2Y - SWAP_X2Z_Y2X_Z2Y NEGATE_PITCH - SWAP_X2Y_Y2Z_Z2X - NEGATE_PITCH - SWAP_YAW_AND_ROLL NEGATE_PITCH - SWAP_YAW_AND_ROLL NEGATE_PITCH - NEGATE_PITCH - NEGATE_PITCH - NEGATE_PITCH - NEGATE_PITCH - NEGATE_PITCH - NEGATE_PITCH - SWAP_YAW_AND_ROLL NEGATE_PITCH - SWAP_YAW_AND_ROLL NEGATE_PITCH - SWAP_YAW_AND_ROLL NEGATE_PITCH - SWAP_YAW_AND_ROLL NEGATE_PITCH - NEGATE_PITCH - NEGATE_PITCH - NEGATE_PITCH - NEGATE_PITCH - SWAP_YAW_AND_ROLL NEGATE_PITCH - SWAP_YAW_AND_ROLL NEGATE_PITCH - SWAP_YAW_AND_ROLL NEGATE_PITCH - SWAP_YAW_AND_ROLL NEGATE_PITCH - SWAP_YAW_AND_ROLL NEGATE_PITCH - SWAP_YAW_AND_ROLL NEGATE_PITCH - SWAP_YAW_AND_ROLL NEGATE_PITCH - SWAP_YAW_AND_ROLL NEGATE_PITCH - SWAP_YAW_AND_ROLL NEGATE_PITCH - SWAP_YAW_AND_ROLL NEGATE_PITCH - SWAP_YAW_AND_ROLL NEGATE_PITCH - SWAP_YAW_AND_ROLL NEGATE_PITCH - SWAP_ROLL_AND_PITCH NEGATE_PITCH - SWAP_ROLL_AND_PITCH NEGATE_PITCH - SWAP_ROLL_AND_PITCH NEGATE_PITCH - SWAP_ROLL_AND_PITCH NEGATE_PITCH - SWAP_ROLL_AND_PITCH NEGATE_PITCH - SWAP_ROLL_AND_PITCH NEGATE_PITCH - SWAP_X2Z_Y2X_Z2Y NEGATE_PITCH - SWAP_X2Z_Y2X_Z2Y NEGATE_PITCH - SWAP_X2Z_Y2X_Z2Y NEGATE_PITCH - SWAP_X2Z_Y2X_Z2Y NEGATE_PITCH - SWAP_X2Z_Y2X_Z2Y NEGATE_PITCH - SWAP_X2Z_Y2X_Z2Y NEGATE_PITCH - SWAP_X2Z_Y2X_Z2Y NEGATE_PITCH - SWAP_X2Z_Y2X_Z2Y NEGATE_PITCH - SWAP_X2Z_Y2X_Z2Y NEGATE_PITCH - SWAP_X2Z_Y2X_Z2Y NEGATE_PITCH - SWAP_X2Z_Y2X_Z2Y NEGATE_PITCH - SWAP_X2Z_Y2X_Z2Y NEGATE_PITCH - SWAP_X2Z_Y2X_Z2Y NEGATE_PITCH - SWAP_X2Z_Y2X_Z2Y NEGATE_PITCH - SWAP_X2Z_Y2X_Z2Y NEGATE_PITCH - SWAP_X2Z_Y2X_Z2Y NEGATE_PITCH - SWAP_X2Z_Y2X_Z2Y NEGATE_PITCH - SWAP_X2Z_Y2X_Z2Y NEGATE_PITCH - SWAP_X2Z_Y2X_Z2Y NEGATE_PITCH - SWAP_X2Z_Y2X_Z2Y NEGATE_PITCH - SWAP_X2Z_Y2X_Z2Y NEGATE_PITCH - SWAP_X2Z_Y2X_Z2Y NEGATE_PITCH - SWAP_X2Z_Y2X_Z2Y NEGATE_PITCH - SWAP_X2Z_Y2X_Z2Y NEGATE_PITCH - SWAP_YAW_AND_ROLL NEGATE_PITCH - SWAP_YAW_AND_ROLL NEGATE_PITCH - SWAP_YAW_AND_ROLL NEGATE_PITCH - SWAP_YAW_AND_ROLL NEGATE_PITCH - SWAP_YAW_AND_ROLL NEGATE_PITCH - SWAP_YAW_AND_ROLL NEGATE_PITCH - SWAP_YAW_AND_ROLL NEGATE_PITCH - SWAP_YAW_AND_ROLL NEGATE_PITCH - SWAP_YAW_AND_ROLL NEGATE_PITCH - SWAP_YAW_AND_ROLL NEGATE_PITCH - SWAP_YAW_AND_ROLL NEGATE_PITCH - - - Body - Forehead/Brows - Eyes/Eye Lids - Cheeks/Lips - Left Hand - Left Arm - Right Hand - Right Arm - Legs - Tail - Hind Limbs - Wings - - - Whole Avatar - Torso - Chest - Neck - Head - Right Eye - Left Eye - Forehead Left Side - Forehead Right Side - Eyebrow Outer Left - Eyebrow Middle Left - Eyebrow Inner Left - Eyebrow Outer Right - Eyebrow Middle Right - Eyebrow Inner Right - EyeLid Upper Left - EyeLid Lower Left - EyeLid Upper Right - EyeLid Lower Left - Ear Upper Left - Ear Lower Left - Ear Upper Right - Ear Lower Right - Nose Left - Nose Center - Nose Right - Cheek Lower Left - Cheek Upper Left - Cheek Lower Right - Cheek Upper Right - Jaw - Teeth Lower - Lip Lower Left - Lip Lower Right - Lip Lower Middle - Tongue Base - Tongue Tip - Jaw Shaper - Forehead Middle - Nose Base - Teeth Upper - Lip Upper Left - Lip Upper Right - Lip Corner Left - Lip Corner Right - Lip Upper Center - Eye corner Inner Left - Eye corner Inner Right - Nose Bridge - Collar - Whole Arm - Forearm - Wrist - Middle Finger Base - Middle Finger Mid - Middle Finger Tip - Index Finger Base - Index Finger Mid - Index Finger Tip - Ring Finger Base - Ring Finger Mid - Ring Finger Tip - Pinky Finger Base - Pinky Finger Mid - Pinky Finger Tip - Thumb Base - Thumb Mid - Thumb Tip - Collar - Whole Arm - Forearm - Wrist - Middle Finger Base - Middle Finger Mid - Middle Finger Tip - Index Finger Base - Index Finger Mid - Index Finger Tip - Ring Finger Base - Ring Finger Mid - Ring Finger Tip - Pinky Finger Base - Pinky Finger Mid - Pinky Finger Tip - Thumb Base - Thumb Mid - Thumb Tip - Root - Left 1 - Left 2 - Left 3 - Left 4 - Left Fan - Right 1 - Right 2 - Right 3 - Right 4 - Right Fan - Right Hip - Right Knee - Right Ankle - Right Foot - Right Toe - Left Hip - Left Knee - Left Ankle - Left Foot - Left Toe - Tail Base - Tail 2 - Tail 3 - Tail 4 - Tail 5 - Tail Tip - Groin - Root - Left Base - Left 2 - Left 3 - Left 4 - Right Base - Right 2 - Right 3 - Right 4 - Bottom - Belly - Left Pec - Right Pec - - - - - - - - - - - - - - - - - - Up/Down: - - - - Left/Right: - - - - In/Out: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Rotation: - - - - - - - - - - Up/Down: - - Left/Right: - - Roll: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/indra/newview/skins/default/xui/en/menu_poser_poses_btn.xml b/indra/newview/skins/default/xui/en/menu_fs_poser_poses_btn.xml similarity index 100% rename from indra/newview/skins/default/xui/en/menu_poser_poses_btn.xml rename to indra/newview/skins/default/xui/en/menu_fs_poser_poses_btn.xml diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 0314b70a5d..708a14f2de 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -940,19 +940,19 @@ function="SideTray.PanelPeopleTab" parameter="nearby_panel" /> - - - + - - + - + parameter="fs_poser" /> + - - - - - - -