diff options
author | Merov Linden <merov@lindenlab.com> | 2015-04-09 16:51:02 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2015-04-09 16:51:02 -0700 |
commit | 8952e8177528fe0eee65916b9e12c3183f15e392 (patch) | |
tree | 3625cecb6fd90bf0de23021c22b5d805527af131 /indra/newview/llwldaycycle.cpp | |
parent | 47a3aecc97faa6ecb5267dde4274f0fe417e8409 (diff) | |
parent | 6b9b4c91d122dccabf7541af70ed68a623ad8810 (diff) |
Merge lindenlab/viewer-tools-update
Diffstat (limited to 'indra/newview/llwldaycycle.cpp')
-rwxr-xr-x | indra/newview/llwldaycycle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llwldaycycle.cpp b/indra/newview/llwldaycycle.cpp index e9b0baf612..3f5579d0fb 100755 --- a/indra/newview/llwldaycycle.cpp +++ b/indra/newview/llwldaycycle.cpp @@ -109,7 +109,7 @@ LLSD LLWLDayCycle::loadDayCycleFromPath(const std::string& file_path) { LL_INFOS("Windlight") << "Loading DayCycle settings from " << file_path << LL_ENDL; - llifstream day_cycle_xml(file_path); + std::ifstream day_cycle_xml(file_path.c_str()); if (day_cycle_xml.is_open()) { // load and parse it @@ -137,7 +137,7 @@ void LLWLDayCycle::save(const std::string& file_path) { LLSD day_data = asLLSD(); - llofstream day_cycle_xml(file_path); + std::ofstream day_cycle_xml(file_path.c_str()); LLPointer<LLSDFormatter> formatter = new LLSDXMLFormatter(); formatter->format(day_data, day_cycle_xml, LLSDFormatter::OPTIONS_PRETTY); day_cycle_xml.close(); |