summaryrefslogtreecommitdiff
path: root/indra/integration_tests
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2011-03-25 17:18:28 -0700
committerMerov Linden <merov@lindenlab.com>2011-03-25 17:18:28 -0700
commit29bcedaf0256968ec48ed3c5791da4b4a23e42d1 (patch)
treee2842447c5cb4385b2e00ed55bb05572ac98c31c /indra/integration_tests
parent17186d6dc1ef8893e15ffcee0b8a8a2afe70febc (diff)
STORM-987 : Fix the creation of images in local dir
Diffstat (limited to 'indra/integration_tests')
-rw-r--r--indra/integration_tests/llimage_libtest/llimage_libtest.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/integration_tests/llimage_libtest/llimage_libtest.cpp b/indra/integration_tests/llimage_libtest/llimage_libtest.cpp
index 2a1a2ae843..365f5f758c 100644
--- a/indra/integration_tests/llimage_libtest/llimage_libtest.cpp
+++ b/indra/integration_tests/llimage_libtest/llimage_libtest.cpp
@@ -223,7 +223,15 @@ void store_output_file(std::list<std::string> &output_filenames, std::list<std::
{
dir = gDirUtilp->getDirName(*in_file);
name = gDirUtilp->getBaseFileName(*in_file,true);
- std::string file_name = dir + delim + name + "." + exten;
+ std::string file_name;
+ if (!dir.empty())
+ {
+ file_name = dir + delim + name + "." + exten;
+ }
+ else
+ {
+ file_name = name + "." + exten;
+ }
output_filenames.push_back(file_name);
}
}