summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2015-04-09 16:51:02 -0700
committerMerov Linden <merov@lindenlab.com>2015-04-09 16:51:02 -0700
commit8952e8177528fe0eee65916b9e12c3183f15e392 (patch)
tree3625cecb6fd90bf0de23021c22b5d805527af131 /indra/newview/llviewermedia.cpp
parent47a3aecc97faa6ecb5267dde4274f0fe417e8409 (diff)
parent6b9b4c91d122dccabf7541af70ed68a623ad8810 (diff)
Merge lindenlab/viewer-tools-update
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
-rwxr-xr-xindra/newview/llviewermedia.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index c758bbcc9e..69b1ee93dc 100755
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -1278,7 +1278,7 @@ void LLViewerMedia::loadCookieFile()
}
// open the file for reading
- llifstream file(resolved_filename);
+ std::ifstream file(resolved_filename.c_str());
if (!file.is_open())
{
LL_WARNS() << "can't load plugin cookies from file \"" << PLUGIN_COOKIE_FILE_NAME << "\"" << LL_ENDL;
@@ -1320,7 +1320,7 @@ void LLViewerMedia::saveCookieFile()
}
// open a file for writing
- llofstream file (resolved_filename);
+ std::ofstream file(resolved_filename.c_str());
if (!file.is_open())
{
LL_WARNS() << "can't open plugin cookie file \"" << PLUGIN_COOKIE_FILE_NAME << "\" for writing" << LL_ENDL;