diff options
author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-21 15:07:17 -0800 |
---|---|---|
committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-21 15:07:17 -0800 |
commit | ea0461c01287a2b026b5621616fb811bfc2d68a2 (patch) | |
tree | f1e94df52aa6f5a68f008278cbaec0eaca063a4a /indra/linux_updater | |
parent | 76990fab4f3c73ab1b2051421c52444de28f9d32 (diff) | |
parent | a830812172d7eb163c06ead3155dc4b43ded4346 (diff) |
Pull and merge https://bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/linux_updater')
-rw-r--r-- | indra/linux_updater/linux_updater.cpp | 2 |
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) |