From ffabef735cdfa42cf5eb5d22030ff18a70ae0b6e Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 1 Nov 2024 00:48:07 +0100 Subject: [PATCH 01/31] Make it possible to show LL badges and FS team badge at the same time in profile --- indra/newview/llpanelprofile.cpp | 30 ++++----- indra/newview/llpanelprofile.h | 7 ++- .../xui/en/panel_profile_secondlife.xml | 57 ++++++++++++++--- .../xui/en/panel_profile_secondlife.xml | 61 +++++++++++++++---- 4 files changed, 120 insertions(+), 35 deletions(-) diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp index c154b30085..ffc292415c 100644 --- a/indra/newview/llpanelprofile.cpp +++ b/indra/newview/llpanelprofile.cpp @@ -1457,14 +1457,8 @@ void LLPanelProfileSecondLife::fillAccountStatus(const LLAvatarData* avatar_data //getChild("badge_text")->setValue(getString("BadgeLinden")); //childSetVisible("badge_layout", true); //childSetVisible("partner_spacer_layout", false); - setBadge("Profile_Badge_Linden", "BadgeLinden"); + setBadge("Profile_Badge_Linden", "BadgeLinden", BadgeLocation::bottom); } - // Add Firestorm team badge - else if (FSData::getInstance()->getAgentFlags(avatar_data->avatar_id) != -1) - { - setBadge("Profile_Badge_Team", "BadgeTeam"); - } - // else if (avatar_data->born_on < sl_release) { // Fix LL UI/UX design accident @@ -1472,7 +1466,7 @@ void LLPanelProfileSecondLife::fillAccountStatus(const LLAvatarData* avatar_data //getChild("badge_text")->setValue(getString("BadgeBeta")); //childSetVisible("badge_layout", true); //childSetVisible("partner_spacer_layout", false); - setBadge("Profile_Badge_Beta", "BadgeBeta"); + setBadge("Profile_Badge_Beta", "BadgeBeta", BadgeLocation::bottom); } else if (customer_lower == "beta_lifetime") { @@ -1481,7 +1475,7 @@ void LLPanelProfileSecondLife::fillAccountStatus(const LLAvatarData* avatar_data //getChild("badge_text")->setValue(getString("BadgeBetaLifetime")); //childSetVisible("badge_layout", true); //childSetVisible("partner_spacer_layout", false); - setBadge("Profile_Badge_Beta_Lifetime", "BadgeBetaLifetime"); + setBadge("Profile_Badge_Beta_Lifetime", "BadgeBetaLifetime", BadgeLocation::bottom); } else if (customer_lower == "lifetime") { @@ -1490,7 +1484,7 @@ void LLPanelProfileSecondLife::fillAccountStatus(const LLAvatarData* avatar_data //getChild("badge_text")->setValue(getString("BadgeLifetime")); //childSetVisible("badge_layout", true); //childSetVisible("partner_spacer_layout", false); - setBadge("Profile_Badge_Lifetime", "BadgeLifetime"); + setBadge("Profile_Badge_Lifetime", "BadgeLifetime", BadgeLocation::bottom); } else if (customer_lower == "secondlifetime_premium") { @@ -1499,7 +1493,7 @@ void LLPanelProfileSecondLife::fillAccountStatus(const LLAvatarData* avatar_data //getChild("badge_text")->setValue(getString("BadgePremiumLifetime")); //childSetVisible("badge_layout", true); //childSetVisible("partner_spacer_layout", false); - setBadge("Profile_Badge_Premium_Lifetime", "BadgePremiumLifetime"); + setBadge("Profile_Badge_Premium_Lifetime", "BadgePremiumLifetime", BadgeLocation::bottom); } else if (customer_lower == "secondlifetime_premium_plus") { @@ -1508,7 +1502,7 @@ void LLPanelProfileSecondLife::fillAccountStatus(const LLAvatarData* avatar_data //getChild("badge_text")->setValue(getString("BadgePremiumPlusLifetime")); //childSetVisible("badge_layout", true); //childSetVisible("partner_spacer_layout", false); - setBadge("Profile_Badge_Pplus_Lifetime", "BadgePremiumPlusLifetime"); + setBadge("Profile_Badge_Pplus_Lifetime", "BadgePremiumPlusLifetime", BadgeLocation::bottom); } else { @@ -1516,14 +1510,22 @@ void LLPanelProfileSecondLife::fillAccountStatus(const LLAvatarData* avatar_data // Fix LL UI/UX design accident //childSetVisible("partner_spacer_layout", true); } + + // Add Firestorm team badge + if (FSData::getInstance()->getAgentFlags(avatar_data->avatar_id) != -1) + { + setBadge("Profile_Badge_Team", "BadgeTeam", BadgeLocation::top); + } + // } // Fix LL UI/UX design accident -void LLPanelProfileSecondLife::setBadge(std::string_view icon_name, std::string_view tooltip) +void LLPanelProfileSecondLife::setBadge(std::string_view icon_name, std::string_view tooltip, BadgeLocation location) { - auto iconctrl = getChild("badge_icon"); + auto iconctrl = getChild(location == BadgeLocation::top ? "top_badge_icon" : "bottom_badge_icon"); iconctrl->setValue(icon_name.data()); iconctrl->setToolTip(getString(tooltip.data())); + childSetVisible(location == BadgeLocation::top ? "top_badge_layout" : "bottom_badge_layout", true); childSetVisible("badge_layout", true); } // diff --git a/indra/newview/llpanelprofile.h b/indra/newview/llpanelprofile.h index f71c0e3db3..d348da069a 100644 --- a/indra/newview/llpanelprofile.h +++ b/indra/newview/llpanelprofile.h @@ -215,8 +215,13 @@ private: void onCommitProfileImage(const LLUUID& id); // Fix LL UI/UX design accident + enum class BadgeLocation + { + top, + bottom + }; void updateButtons(); - void setBadge(std::string_view icon_name, std::string_view tooltip); + void setBadge(std::string_view icon_name, std::string_view tooltip, BadgeLocation location); private: typedef std::map group_map_t; diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml index fb2320ccd8..0f494440d8 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml @@ -478,16 +478,55 @@ visible="false" auto_resize="false" user_resize="false"> - + orientation="vertical"> + + + + + + + - + + + + + + + + From ea49e08dd9364f646b04ce8ae6fc8a1085cb0e3d Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Fri, 1 Nov 2024 14:32:35 +0100 Subject: [PATCH 02/31] Poser XML: Small cleanup of the undo/reset sales/positions name attributes --- .../newview/skins/default/xui/de/floater_fs_poser.xml | 6 +++--- .../newview/skins/default/xui/en/floater_fs_poser.xml | 6 +++--- .../newview/skins/default/xui/pl/floater_fs_poser.xml | 10 +++++----- .../newview/skins/default/xui/ru/floater_fs_poser.xml | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/indra/newview/skins/default/xui/de/floater_fs_poser.xml b/indra/newview/skins/default/xui/de/floater_fs_poser.xml index 4391b3a3d5..1afaba07d0 100644 --- a/indra/newview/skins/default/xui/de/floater_fs_poser.xml +++ b/indra/newview/skins/default/xui/de/floater_fs_poser.xml @@ -264,15 +264,15 @@ - - - - - - relative_width="0.9" /> + + + + + + + + + + + + + + Trackpad Sensitivity: + + + + + left="0" name="button_controls_panel" width="800"> - - @@ -1025,8 +1088,8 @@ width="565"> mouse_opaque="false" left_pad="0" top_delta="0" - name="advbutton_spacer_panel" - width="54"/> + name="button_spacer_panel" + width="36"/> @@ -1103,7 +1166,7 @@ width="565"> left_pad="0" top_delta="0" name="button_spacer_panel" - width="60"/> + width="58"/> + follows="all" + background_visible="false" + height="299" + layout="topleft" + left="0" + title="Misc" + name="misc_joints_panel" + top="0" + width="481"> + column_padding="2" + height="300" + follows="all" + can_sort="false" + layout="topleft" + left="2" + width="479" + multi_select="true" + name="misc_joints_scroll" + top="0"> + label="" + name="icon" + relative_width="0.1"/> + label="Body Part" + name="joint" + relative_width="0.9"/> + follows="all" + background_visible="false" + height="299" + layout="topleft" + left="0" + title="Physics" + name="collision_volumes_panel" + top="0" + width="481"> + column_padding="2" + height="300" + follows="all" + can_sort="false" + layout="topleft" + left="2" + width="479" + multi_select="true" + name="collision_volumes_scroll" + top="0"> + label="" + name="icon" + relative_width="0.1"/> + label="Physics" + name="joint" + relative_width="0.9"/> + follows="all" + height="302" + background_visible="false" + layout="topleft" + visible="true" + title="Model" + mouse_opaque="false" + name="avatarSelection_panel" + top="0" + left="0" + width="153"> show_permissions_granted="true" width="317" /> + column_padding="0" + height="160" + can_sort="false" + follows="all" + layout="topleft" + left="3" + tool_tip="Select the Avatar or Animesh you want to animate." + width="151" + multi_select="false" + name="avatarSelection_scroll" + top="0"> + label="" + name="icon" + relative_width="0.0"/> + label="Select Someone to Pose..." + name="name" + relative_width="1.0"/> + label="UUID" + name="uuid" + relative_width="0.0"/> + label="SaveFileName" + name="saveFileName" + relative_width="0.0"/> - Trackpad Sensitivity: + follows="all" + background_visible="false" + height="299" + layout="topleft" + left="0" + title="Settings" + name="settings_panel" + top="0" + width="481"> + + Trackpad Sensitivity: + + decimal_digits="2" + can_edit_text="true" + follows="left|top" + height="14" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="0" + max_val="2" + min_val="0.01" + name="trackpad_sensitivity_slider" + tool_tip="Adjusts the sensitivity of the trackball" + top_pad="3" + width="170" > + function="Poser.AdjustTrackPadSensitivity"/> + control_name="FSPoserStopPosingWhenClosed" + name="stop_posing_on_close_checkbox" + height="16" + label="Stop posing when closed" + follows="left|top" + left="5" + tool_tip="Not stopping you pose can be helpful if you do a lot of work, and don't want to accidentally lose it." + top_pad="5" + width="134" /> - Rotation: - + follows="left|top|bottom" + height="290" + background_visible="false" + layout="topleft" + mouse_opaque="false" + name="trackball_panel" + enabled="false" + top="0" + width="160" + left_pad="2"> + + Rotation: + + + follows="left|top|bottom" + height="22" + background_visible="false" + layout="topleft" + mouse_opaque="false" + left="0" + top_pad="2" + name="trackball_button_panel" + width="232"> - Up/Down: - - Left/Right: - - Roll: - + + Up/Down: + + + + Left/Right: + + + + Roll: + + + follows="top|left|bottom" + height="290" + background_visible="false" + layout="topleft" + mouse_opaque="false" + left_pad="2" + visible="false" + name="poses_loadSave" + top="0" + width="225"> + column_padding="0" + height="268" + follows="left|top|right" + layout="topleft" + tool_tip="Load a pose for who you are animating." + width="225" + multi_select="true" + name="poses_scroll" + top="0"> + label="Pose Name" + name="name"/> + follows="top|left" + layout="topleft" + height="21" + top_pad="-2" + commit_on_focus_lost="false" + label="Enter Pose Name To Save..." + name="pose_save_name" + width="225"/> + follows="top|left|right" + layout="topleft" + height="22" + auto_resize="false" + name="button_controls_layout" + width="800"> + follows="left|top|bottom" + height="100" + background_visible="false" + layout="topleft" + mouse_opaque="false" + top="0" + left="0" + name="button_controls_panel" + width="800"> + follows="left|top|bottom" + height="22" + background_visible="false" + layout="topleft" + mouse_opaque="false" + left_pad="0" + top_delta="0" + name="advbutton_spacer_panel" + width="36"/> + follows="left|top|bottom" + height="22" + background_visible="false" + layout="topleft" + mouse_opaque="false" + left_pad="0" + top_delta="0" + name="button_spacer_panel" + width="58"/> + height="21" + follows="top|left" + layout="topleft" + label="Load Pose" + enabled="false" + visible="false" + tool_tip="Load the currently selected pose." + image_overlay="Icon_Undock_Foreground" + image_overlay_alignment="left" + image_hover_unselected="Toolbar_Middle_Over" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + menu_filename="menu_fs_poser_poses_btn.xml" + menu_position="topright" + name="load_poses_button" + left_pad="1" + top_delta="0" + width="97"/> + follows="top|left|right" + layout="topleft" + height="97" + auto_resize="false" + name="advanced_controls_layout" + width="600"> + follows="top|left|right" + height="97" + left="0" + layout="all" + enabled="false" + background_visible="false" + mouse_opaque="false" + visible="false" + name="advanced_parent_panel" + width="555"> + follows="all" + halign="center" + height="97" + layout="topleft" + name="modifier_tabs" + tab_height="20" + tab_group="1" + tab_position="top" + top_pad="0" + width="555"> + follows="all" + background_visible="false" + height="97" + layout="topleft" + left="0" + title="Body Part Position" + name="position_panel" + top="0" + width="555"> + decimal_digits="3" + can_edit_text="true" + follows="left|top" + height="14" + increment="0.001" + initial_value="0" + label="Position X:" + label_width="70" + layout="topleft" + left="10" + max_val="0.5" + min_val="-0.5" + name="Advanced_Position_X" + top_pad="6" + width="380" > + function="Poser.Advanced.PositionSet"/> + decimal_digits="3" + can_edit_text="true" + follows="left|top" + height="14" + increment="0.001" + initial_value="0" + label="Position Y:" + label_width="70" + layout="topleft" + left_delta="0" + max_val="0.5" + min_val="-0.5" + name="Advanced_Position_Y" + top_pad="1" + width="380" > + function="Poser.Advanced.PositionSet"/> + decimal_digits="3" + can_edit_text="true" + follows="left|top" + height="14" + increment="0.001" + initial_value="0" + label="Position Z:" + label_width="70" + layout="topleft" + left_delta="0" + max_val="0.5" + min_val="-0.5" + name="Advanced_Position_Z" + top_pad="1" + width="380" > + function="Poser.Advanced.PositionSet"/> + follows="all" + background_visible="false" + height="97" + layout="topleft" + left="0" + title="Body Part Scale" + name="scale_panel" + top="0" + width="607"> + decimal_digits="3" + can_edit_text="true" + follows="left|top" + height="14" + increment="0.001" + initial_value="0" + label="Scale X:" + label_width="70" + layout="topleft" + left="10" + max_val="2" + min_val="0" + name="Advanced_Scale_X" + top_pad="6" + width="380" > + function="Poser.Advanced.ScaleSet"/> + decimal_digits="3" + can_edit_text="true" + follows="left|top" + height="14" + increment="0.001" + initial_value="0" + label="Scale Y:" + label_width="70" + layout="topleft" + left_delta="0" + max_val="2" + min_val="0" + name="Advanced_Scale_Y" + top_pad="1" + width="380" > + function="Poser.Advanced.ScaleSet"/> + decimal_digits="3" + can_edit_text="true" + follows="left|top" + height="14" + increment="0.001" + initial_value="0" + label="Scale Z:" + label_width="70" + layout="topleft" + left_delta="0" + max_val="2" + min_val="0" + name="Advanced_Scale_Z" + top_pad="1" + width="380" > + function="Poser.Advanced.ScaleSet"/> diff --git a/indra/newview/skins/default/xui/en/widgets/fs_virtual_trackpad.xml b/indra/newview/skins/default/xui/en/widgets/fs_virtual_trackpad.xml index e9fba5ac27..b3151312f7 100644 --- a/indra/newview/skins/default/xui/en/widgets/fs_virtual_trackpad.xml +++ b/indra/newview/skins/default/xui/en/widgets/fs_virtual_trackpad.xml @@ -4,7 +4,6 @@ width="150" height="150" pinch_mode="false" - user_resize="false" image_sphere="VirtualTrackball_Sphere" image_moon_back="VirtualTrackball_Moon_Back" image_moon_front="VirtualTrackball_Moon_Front" From 4fae7a4a6a2c1f71e32ebcde71cdc637b0eb2799 Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Tue, 5 Nov 2024 17:31:49 +0100 Subject: [PATCH 27/31] Updated Polish translation, fixing small typo in English one (poser) --- .../skins/default/xui/en/floater_fs_poser.xml | 2 +- .../skins/default/xui/pl/floater_fs_poser.xml | 48 +++++++++++-------- .../skins/default/xui/pl/notifications.xml | 2 +- 3 files changed, 30 insertions(+), 22 deletions(-) diff --git a/indra/newview/skins/default/xui/en/floater_fs_poser.xml b/indra/newview/skins/default/xui/en/floater_fs_poser.xml index 8d2bad9879..20b93cef01 100644 --- a/indra/newview/skins/default/xui/en/floater_fs_poser.xml +++ b/indra/newview/skins/default/xui/en/floater_fs_poser.xml @@ -795,7 +795,7 @@ width="403"> label="Stop posing when closed" follows="left|top" left="5" - tool_tip="Not stopping you pose can be helpful if you do a lot of work, and don't want to accidentally lose it." + tool_tip="Not stopping your pose can be helpful if you do a lot of work, and don't want to accidentally lose it." top_pad="5" width="134" /> diff --git a/indra/newview/skins/default/xui/pl/floater_fs_poser.xml b/indra/newview/skins/default/xui/pl/floater_fs_poser.xml index f63761b015..7cba4ebc75 100644 --- a/indra/newview/skins/default/xui/pl/floater_fs_poser.xml +++ b/indra/newview/skins/default/xui/pl/floater_fs_poser.xml @@ -12,6 +12,7 @@ Ogon Kończyny tylne Skrzydła + Uszy/Nos Cały awatar Tułów Klatka piersiowa @@ -52,7 +53,7 @@ Kształt szczęki Środek czoła Podstawa nosa - Teeth Upper + Zęby górne Warga górna lewa Warga górna prawa Lewy kącik ust @@ -110,12 +111,12 @@ Prawo 3 Prawo 4 Prawy wachlarz - Prawe biodro + Prawa cała noga Prawe kolano Prawa kostka Prawa stopa Prawy paluch - Lewe biodro + Lewa cała noga Lewe kolano Lewa kostka Lewa stopa @@ -140,13 +141,12 @@ Brzuch Lewa pierś Prawa pierś + Lewa podstawa + Prawa podstawa + Lewy czubek + Prawy czubek - - - - - @@ -179,6 +179,11 @@ + + + + + @@ -186,11 +191,6 @@