summaryrefslogtreecommitdiff
path: root/indra/linux_updater
diff options
context:
space:
mode:
authorWilliam Todd Stinson <stinson@lindenlab.com>2012-11-20 16:20:40 -0800
committerWilliam Todd Stinson <stinson@lindenlab.com>2012-11-20 16:20:40 -0800
commit67bc42a80ac0c125a719e2d48c974f9259c04551 (patch)
treee76b0c3acf0a53d98fb7a7fbc79d912bbb916588 /indra/linux_updater
parent1ece38912188650c9bc5a1cf906ca4a88acc21c4 (diff)
parentcca22d608deb26cf21b33629b170e70a0e221575 (diff)
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
Diffstat (limited to 'indra/linux_updater')
-rw-r--r--indra/linux_updater/linux_updater.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/linux_updater/linux_updater.cpp b/indra/linux_updater/linux_updater.cpp
index 277f0a5367..991dfd9dce 100644
--- a/indra/linux_updater/linux_updater.cpp
+++ b/indra/linux_updater/linux_updater.cpp
@@ -251,7 +251,7 @@ std::string next_image_filename(std::string& image_path, LLDirIterator& iter)
{
std::string image_filename;
iter.next(image_filename);
- return image_path + "/" + image_filename;
+ return gDirUtilp->add(image_path, image_filename);
}
void on_window_closed(GtkWidget *sender, GdkEvent* event, gpointer data)