diff options
| author | prep <prep@lindenlab.com> | 2012-11-28 16:36:34 -0500 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2012-11-28 16:36:34 -0500 |
| commit | e0432f98ee515f9777604aa784d28b63d2abfe40 (patch) | |
| tree | 398fcae43d9904bde2112a7085c7ef7c1a926100 /indra/linux_updater | |
| parent | bf87920fc91e2ca2b8d9f6f2656ad632c3005164 (diff) | |
| parent | f5a47417fde70f78b99744386c6da0bcf78e60d5 (diff) | |
SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance.
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 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) |