diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-11-06 16:37:51 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-11-06 16:37:51 -0500 |
| commit | 55a812ca7797ec1b857e95254fde1fa75bd92d06 (patch) | |
| tree | c15fdb992af40162cc5adb3c25257f3ba1f069a1 /indra/newview/lldaycyclemanager.cpp | |
| parent | bf6d1670756ba96abde570e7dbbf94c62c71ca5b (diff) | |
| parent | a9ea41003587e2411c7247f84ea04df2a686552b (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/lldaycyclemanager.cpp')
| -rw-r--r-- | indra/newview/lldaycyclemanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldaycyclemanager.cpp b/indra/newview/lldaycyclemanager.cpp index 347a467a8b..8af2f4ea33 100644 --- a/indra/newview/lldaycyclemanager.cpp +++ b/indra/newview/lldaycyclemanager.cpp @@ -184,7 +184,7 @@ void LLDayCycleManager::loadPresets(const std::string& dir) { std::string file; if (!dir_iter.next(file)) break; // no more files - loadPreset(dir + file); + loadPreset(gDirUtilp->add(dir, file)); } } |