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/newview/lldaycyclemanager.cpp | |
| parent | 0e13bf5f9ebfb29cc40470df5088ecde4d3ec20f (diff) | |
| parent | 120733ea0d479f3c0224f94bb17e5dc32194dc9f (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)); } } |