summaryrefslogtreecommitdiff
path: root/indra/newview/llwaterparammanager.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2015-04-10 11:02:37 -0400
committerOz Linden <oz@lindenlab.com>2015-04-10 11:02:37 -0400
commit5c6cf3e7fb9f592e3a293921175b64b515bac23f (patch)
tree15933c1910c4b337e0c181434b6d653628f62eed /indra/newview/llwaterparammanager.cpp
parent6b9b4c91d122dccabf7541af70ed68a623ad8810 (diff)
restore the ll[io]fstream because we need them as wrappers on Windows for wide char paths; on other platforms they are now just typedefs to the std classes
Diffstat (limited to 'indra/newview/llwaterparammanager.cpp')
-rwxr-xr-xindra/newview/llwaterparammanager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llwaterparammanager.cpp b/indra/newview/llwaterparammanager.cpp
index e0b89e3eb9..374792193c 100755
--- a/indra/newview/llwaterparammanager.cpp
+++ b/indra/newview/llwaterparammanager.cpp
@@ -110,7 +110,7 @@ void LLWaterParamManager::loadPresetsFromDir(const std::string& dir)
bool LLWaterParamManager::loadPreset(const std::string& path)
{
- std::ifstream xml_file;
+ llifstream xml_file;
std::string name(gDirUtilp->getBaseFileName(LLURI::unescape(path), /*strip_exten = */ true));
xml_file.open(path.c_str());
@@ -150,7 +150,7 @@ void LLWaterParamManager::savePreset(const std::string & name)
paramsData = mParamList[name].getAll();
// write to file
- std::ofstream presetsXML(pathName.c_str());
+ llofstream presetsXML(pathName.c_str());
LLPointer<LLSDFormatter> formatter = new LLSDXMLFormatter();
formatter->format(paramsData, presetsXML, LLSDFormatter::OPTIONS_PRETTY);
presetsXML.close();