diff options
author | Merov Linden <merov@lindenlab.com> | 2012-11-26 15:01:57 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-11-26 15:01:57 -0800 |
commit | 8076f7a33d7f5ee93d4ba8f71a7ba0fed5e364a7 (patch) | |
tree | 6a7d0f88666e16948e73d1098c99edc7513b6e49 /indra/linux_updater/linux_updater.cpp | |
parent | 7ca2508cc2adcdc5201bd53e814246e156bc6013 (diff) | |
parent | 890965faf5baa5f6f832e086991d59bb8d33b7bc (diff) |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/linux_updater/linux_updater.cpp')
-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) |