diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-08-22 18:30:58 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-08-22 18:30:58 +0800 |
| commit | 036fabec4bcf82e3391a866eda36b642f93261a0 (patch) | |
| tree | 35c1646373d55e7ddb31eb5329ea1c3236a24409 /indra/newview/skins | |
| parent | efef28c1f51c4b8ec53c3742961a11b8c706f17f (diff) | |
| parent | 09eeab38ff66ec420a8248041c4e61e11eed4b0f (diff) | |
Merge branch 'main' into 2025.06
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_about.xml | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_advanced.xml | 12 |
2 files changed, 13 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index 4e7ce2c32f..0d22d37085 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -103,8 +103,8 @@ gwigz (nya) EmilyAmiee Bavid Dailey Aria (Tashia Redrose) Cate (32a) Hiroo Ono Melodey Keysin (scoutkeysin) -Yikes Lopez Padoria -~ ( ^-^ ) ~ (cutie_qu) +Yikes Lopez Padoria Teuden +~ ( ^-^ ) ~ (cutie_qu) Markus Teuden </text_editor> <text follows="top|left" @@ -135,6 +135,7 @@ Vir Linden - Making it possible for the project to have a place in SL nutsobvious - Early testing and video proof Soft Linden - Security testing Kyle Linden - Giving TPV parcel 2 to Erik Kundiman +Signal Linden - Opening opportunities for Megapahit to contribute more </text_editor> </panel> </accordion_tab> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml index 54105a7d4e..b27b6dd73a 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml @@ -213,7 +213,6 @@ layout="topleft" left="30" name="stream_notification_channel_enabled" - top_pad="10" width="256"> </check_box> <spinner @@ -233,6 +232,15 @@ name="stream_notification_channel" top_pad="-15" width="170" /> + <check_box + control_name="SnapshotTimestamp" + height="16" + label="Add timestamp to snapshot file names" + layout="topleft" + left="30" + name="snapshot_timestamp" + width="256"> + </check_box> <check_box control_name="AllowMultipleViewers" @@ -242,7 +250,7 @@ layout="topleft" left="30" name="allow_multiple_viewer_check" - top_pad="20" + top_pad="15" width="237"/> <check_box control_name="ForceShowGrid" |