Merge branch 'main' into 2025.06

4 files changed, 32 insertions, 4 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 2b26eb105e..ab236f2fba 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11587,6 +11587,17 @@
       <key>Value</key>
       <integer>75</integer>
     </map>
+    <key>SnapshotTimestamp</key>
+    <map>
+      <key>Comment</key>
+      <string>Add timestamp to snapshot file names</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>AbuseReportScreenshotDelay</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 125a34bfde..db6b23229b 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -4839,13 +4839,21 @@ void LLViewerWindow::saveImageLocal(LLImageFormatted *image, const snapshot_save
     auto err = 0;
     auto extension("." + image->getExtension());
     auto now = LLDate::now();
+    static LLCachedControl<bool> snapshot_timestamp(gSavedSettings, "SnapshotTimestamp", true) ;
     do
     {
         filepath = sSnapshotDir;
         filepath += gDirUtilp->getDirDelimiter();
         filepath += sSnapshotBaseName;
+        if (snapshot_timestamp)
+        {
         filepath += now.toLocalDateString("_%Y-%m-%d_%H%M%S");
         filepath += llformat("%.2d", i);
+        }
+	else if (is_snapshot_name_loc_set)
+        {
+            filepath += llformat("_%.3d", i);
+        }
         filepath += extension;
 
         llstat stat_info;
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"