diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2012-11-14 14:37:38 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2012-11-14 14:37:38 -0500 |
commit | 852e60859977a6a2b088d8c99ae7350fe3a3d587 (patch) | |
tree | 2cc2f438c657cc554c64bc1e6248a4f716b99a29 /indra/linux_updater | |
parent | 0e13bf5f9ebfb29cc40470df5088ecde4d3ec20f (diff) | |
parent | 120733ea0d479f3c0224f94bb17e5dc32194dc9f (diff) |
Automated merge with http://hg.secondlife.com/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) |