summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authordaianakproductengine <daianakproductengine@lindenlab.com>2017-09-26 18:22:05 +0300
committerdaianakproductengine <daianakproductengine@lindenlab.com>2017-09-26 18:22:05 +0300
commit36c991877f128bfb76e1b6d476d7f49956c0d87f (patch)
tree18944f0c69b99616adead71fb2109eacc54d184b /indra/newview/llviewerwindow.cpp
parent515687cc32a96b8eb3ac78b077351e6d35a88abc (diff)
MAINT-1208 Fixed 'Save as' screenshot dialog doesn't allow to save screenshot without automatically adding number to name of file
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
-rw-r--r--indra/newview/llviewerwindow.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index b052a48424..7b4895b862 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -4379,6 +4379,8 @@ BOOL LLViewerWindow::saveImageNumbered(LLImageFormatted *image, BOOL force_picke
else
pick_type = LLFilePicker::FFSAVE_ALL; // ???
+ BOOL is_snapshot_name_loc_set = isSnapshotLocSet();
+
// Get a base file location if needed.
if (force_picker || !isSnapshotLocSet())
{
@@ -4427,7 +4429,12 @@ BOOL LLViewerWindow::saveImageNumbered(LLImageFormatted *image, BOOL force_picke
filepath = sSnapshotDir;
filepath += gDirUtilp->getDirDelimiter();
filepath += sSnapshotBaseName;
- filepath += llformat("_%.3d",i);
+
+ if (is_snapshot_name_loc_set)
+ {
+ filepath += llformat("_%.3d",i);
+ }
+
filepath += extension;
llstat stat_info;