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

1 files changed, 7 insertions, 7 deletions

diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
index 4c8a4ece70..fc9e85caf8 100755
--- a/indra/newview/llfavoritesbar.cpp
+++ b/indra/newview/llfavoritesbar.cpp
@@ -1469,7 +1469,7 @@ void LLFavoritesOrderStorage::destroyClass()
 
 
 	std::string old_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "stored_favorites.xml");
-	std::ifstream file;
+	llifstream file;
 	file.open(old_filename.c_str());
 	if (file.is_open())
 	{
@@ -1507,7 +1507,7 @@ void LLFavoritesOrderStorage::load()
 	std::string filename = getSavedOrderFileName();
 
 	LLSD settings_llsd;
-	std::ifstream file;
+	llifstream file;
 	file.open(filename.c_str());
 	if (file.is_open())
 	{
@@ -1541,7 +1541,7 @@ void LLFavoritesOrderStorage::saveFavoritesSLURLs()
 	std::string filename = getStoredFavoritesFilename();
     if (!filename.empty())
     {
-        std::ifstream in_file;
+        llifstream in_file;
         in_file.open(filename.c_str());
         LLSD fav_llsd;
         if (in_file.is_open())
@@ -1588,7 +1588,7 @@ void LLFavoritesOrderStorage::saveFavoritesSLURLs()
         // as we'll compare it with the stored credentials in the login panel.
         fav_llsd[av_name.getUserName()] = user_llsd;
 
-        std::ofstream file;
+        llofstream file;
         file.open(filename.c_str());
         if ( file.is_open() )
         {
@@ -1613,7 +1613,7 @@ void LLFavoritesOrderStorage::removeFavoritesRecordOfUser()
     if (!filename.empty())
     {
         LLSD fav_llsd;
-        std::ifstream file;
+        llifstream file;
         file.open(filename.c_str());
         if (file.is_open())
         {
@@ -1630,7 +1630,7 @@ void LLFavoritesOrderStorage::removeFavoritesRecordOfUser()
                 fav_llsd.erase(av_name.getUserName());
             }
         
-            std::ofstream out_file;
+            llofstream out_file;
             out_file.open(filename.c_str());
             if ( out_file.is_open() )
             {
@@ -1686,7 +1686,7 @@ void LLFavoritesOrderStorage::save()
                 settings_llsd[iter->first.asString()] = iter->second;
             }
 
-            std::ofstream file;
+            llofstream file;
             file.open(filename.c_str());
             if ( file.is_open() )
             {