Add a way to have snapshot legacy file namingHEADmain

as requested by Bavid Dailey.
Having timestamp is set as the default.

3 files changed, 29 insertions, 2 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 60a2d1239e..4a45456cfc 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11565,6 +11565,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 a2e77e9257..d3af22a9d9 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -4829,13 +4829,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/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index c38af9d4fa..8248da9fda 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"