diff options
| author | simon <none@none> | 2014-05-07 13:19:05 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-05-07 13:19:05 -0700 |
| commit | dc4c184696b308b8f60fa1dd751b35e22bd47d62 (patch) | |
| tree | 1606d992f1cce6fe19572042c456725eb95d7066 /indra/newview/lldaycyclemanager.cpp | |
| parent | 883467a3cc421fca68a25589114e0e3f0538ff0e (diff) | |
| parent | 250db74bf9325acdc1169f6c13d297e7fe44b753 (diff) | |
Merge downstream version 3.7.8 code
Diffstat (limited to 'indra/newview/lldaycyclemanager.cpp')
| -rwxr-xr-x | 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 8af2f4ea33..131675310e 100755 --- a/indra/newview/lldaycyclemanager.cpp +++ b/indra/newview/lldaycyclemanager.cpp @@ -193,7 +193,7 @@ bool LLDayCycleManager::loadPreset(const std::string& path) LLSD data = LLWLDayCycle::loadDayCycleFromPath(path); if (data.isUndefined()) { - llwarns << "Error loading day cycle from " << path << llendl; + LL_WARNS() << "Error loading day cycle from " << path << LL_ENDL; return false; } |