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/newview/lldaycyclemanager.cpp | |
| parent | 7ca2508cc2adcdc5201bd53e814246e156bc6013 (diff) | |
| parent | 890965faf5baa5f6f832e086991d59bb8d33b7bc (diff) | |
Pull merge from richard/viewer-chui
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)); } } |