Merge branch 'develop-linux' into project/lua_editor

# Conflicts:
#	indra/newview/llpreviewscript.cpp

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/test/test.cpp b/indra/test/test.cpp
index 5b36bb618d..cee8b84438 100644
--- a/indra/test/test.cpp
+++ b/indra/test/test.cpp
@@ -79,7 +79,7 @@ public:
     RecordToTempFile()
         : LLError::Recorder(),
         mTempFile("log", ""),
-        mFile(mTempFile.getName().c_str())
+        mFile(mTempFile.getPath())
     {
     }
 
@@ -97,13 +97,13 @@ public:
     void reset()
     {
         mFile.close();
-        mFile.open(mTempFile.getName().c_str());
+        mFile.open(mTempFile.getPath());
     }
 
     void replay(std::ostream& out)
     {
         mFile.close();
-        llifstream  inf(mTempFile.getName().c_str());
+        llifstream  inf(mTempFile.getPath());
         std::string line;
         while (std::getline(inf, line))
         {