diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-20 16:20:40 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-20 16:20:40 -0800 |
| commit | 67bc42a80ac0c125a719e2d48c974f9259c04551 (patch) | |
| tree | e76b0c3acf0a53d98fb7a7fbc79d912bbb916588 /indra/newview/lldaycyclemanager.cpp | |
| parent | 1ece38912188650c9bc5a1cf906ca4a88acc21c4 (diff) | |
| parent | cca22d608deb26cf21b33629b170e70a0e221575 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
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)); } } |