summaryrefslogtreecommitdiff
path: root/indra/linux_updater/linux_updater.cpp
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2012-11-28 23:46:06 +0000
committerDon Kjer <don@lindenlab.com>2012-11-28 23:46:06 +0000
commit96ef49df75c0248e4843f9a5b53f010b819d59f3 (patch)
tree9f542fae939073bbb39464500d3fd477d1ed5fe5 /indra/linux_updater/linux_updater.cpp
parentdc71cae16b9c49a1d6b4d4a888c3a574049fd087 (diff)
parente0432f98ee515f9777604aa784d28b63d2abfe40 (diff)
Automated merge
Diffstat (limited to 'indra/linux_updater/linux_updater.cpp')
-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 e3ee137897..86fa596aef 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)