Pull merge from lindenlab/viewer-tools-update (includes viewer-release)

1 files changed, 2 insertions, 2 deletions

diff --git a/indra/newview/llfloaterautoreplacesettings.cpp b/indra/newview/llfloaterautoreplacesettings.cpp
index a16ecf2a80..6e56e929df 100755
--- a/indra/newview/llfloaterautoreplacesettings.cpp
+++ b/indra/newview/llfloaterautoreplacesettings.cpp
@@ -353,7 +353,7 @@ void LLFloaterAutoReplaceSettings::onImportList()
 	LLFilePicker& picker = LLFilePicker::instance();
 	if( picker.getOpenFile( LLFilePicker::FFLOAD_XML) )
 	{
-		std::ifstream file;
+		llifstream file;
 		file.open(picker.getFirstFile().c_str());
 		LLSD newList;
 		if (file.is_open())
@@ -545,7 +545,7 @@ void LLFloaterAutoReplaceSettings::onExportList()
 	LLFilePicker& picker = LLFilePicker::instance();
 	if( picker.getSaveFile( LLFilePicker::FFSAVE_XML, listFileName) )
 	{
-		std::ofstream file;
+		llofstream file;
 		file.open(picker.getFirstFile().c_str());
 		LLSDSerialize::toPrettyXML(*list, file);
 		file.close();