diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-06-15 15:53:45 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-06-15 15:53:45 -0400 |
| commit | 95fc2d48eced78b2aaa29b9e8b3f9410eed1ad8c (patch) | |
| tree | 7748f0142e0ecbc91daa33c42a679799c4375d5e /indra/newview/llagentpilot.cpp | |
| parent | 96d16928600dbf3666221a19575af9330840cfd5 (diff) | |
| parent | e0f5ed29daa3b2803aaec60a77bde8df7df292ee (diff) | |
merge changes for 3.7.30-release
Diffstat (limited to 'indra/newview/llagentpilot.cpp')
| -rwxr-xr-x | indra/newview/llagentpilot.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llagentpilot.cpp b/indra/newview/llagentpilot.cpp index 44589f0d57..cfc445f998 100755 --- a/indra/newview/llagentpilot.cpp +++ b/indra/newview/llagentpilot.cpp @@ -84,7 +84,7 @@ void LLAgentPilot::loadTxt(const std::string& filename) return; } - llifstream file(filename); + llifstream file(filename.c_str()); if (!file) { @@ -125,7 +125,7 @@ void LLAgentPilot::loadXML(const std::string& filename) return; } - llifstream file(filename); + llifstream file(filename.c_str()); if (!file) { @@ -168,7 +168,7 @@ void LLAgentPilot::save() void LLAgentPilot::saveTxt(const std::string& filename) { llofstream file; - file.open(filename); + file.open(filename.c_str()); if (!file) { @@ -191,7 +191,7 @@ void LLAgentPilot::saveTxt(const std::string& filename) void LLAgentPilot::saveXML(const std::string& filename) { llofstream file; - file.open(filename); + file.open(filename.c_str()); if (!file) { |