summaryrefslogtreecommitdiff
path: root/indra/newview/llpreviewtexture.cpp
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2021-07-02 16:11:39 +0300
committerMnikolenko Productengine <mnikolenko@productengine.com>2021-07-02 16:11:39 +0300
commit66793abc716d86660e2fa4c7731e235881525c69 (patch)
treeee8ee8ad965efb60bb362ebed35d6633ecbde90c /indra/newview/llpreviewtexture.cpp
parent7a6b5a598487c6162c56246561bae205824c892b (diff)
SL-14075 allow exporting multiple textures with the same name
Diffstat (limited to 'indra/newview/llpreviewtexture.cpp')
-rw-r--r--indra/newview/llpreviewtexture.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp
index 53869606bb..cd7b93aba7 100644
--- a/indra/newview/llpreviewtexture.cpp
+++ b/indra/newview/llpreviewtexture.cpp
@@ -319,10 +319,10 @@ void LLPreviewTexture::saveTextureToFile(const std::vector<std::string>& filenam
}
-void LLPreviewTexture::saveMultipleToFile()
+void LLPreviewTexture::saveMultipleToFile(const std::string& file_name)
{
std::string texture_location(gSavedSettings.getString("TextureSaveLocation"));
- std::string texture_name = getItem()->getName();
+ std::string texture_name = file_name.empty() ? getItem()->getName() : file_name;
std::string filepath;
S32 i = 0;