Merge lindenlab/viewer-tools-update

1 files changed, 10 insertions, 5 deletions

diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 962cdf0268..351494aae7 100755
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -1023,11 +1023,16 @@ void LLSpeakerVolumeStorage::load()
 	LL_INFOS("Voice") << "Loading stored speaker volumes from: " << filename << LL_ENDL;
 
 	LLSD settings_llsd;
-	llifstream file;
-	file.open(filename);
+	std::ifstream file;
+	file.open(filename.c_str());
 	if (file.is_open())
 	{
-		LLSDSerialize::fromXML(settings_llsd, file);
+		if (LLSDParser::PARSE_FAILURE == LLSDSerialize::fromXML(settings_llsd, file))
+        {
+            LL_WARNS("Voice") << "failed to parse " << filename << LL_ENDL;
+            
+        }
+            
 	}
 
 	for (LLSD::map_const_iterator iter = settings_llsd.beginMap();
@@ -1061,8 +1066,8 @@ void LLSpeakerVolumeStorage::save()
 			settings_llsd[iter->first.asString()] = volume;
 		}
 
-		llofstream file;
-		file.open(filename);
+		std::ofstream file;
+		file.open(filename.c_str());
 		LLSDSerialize::toPrettyXML(settings_llsd, file);
 	}
 }