Merge branch 'develop-linux' into project/lua_editor

# Conflicts:
#	indra/newview/llpreviewscript.cpp

8 files changed, 18 insertions, 18 deletions

diff --git a/indra/llmessage/llassetstorage.cpp b/indra/llmessage/llassetstorage.cpp
index 10fd56a68e..a8f0554a71 100644
--- a/indra/llmessage/llassetstorage.cpp
+++ b/indra/llmessage/llassetstorage.cpp
@@ -467,7 +467,7 @@ bool LLAssetStorage::findInCacheAndInvokeCallback(const LLUUID& uuid, LLAssetTyp
         else
         {
             LL_WARNS("AssetStorage") << "Asset vfile " << uuid << ":" << type
-                                     << " found in static cache with bad size " << file.getSize() << ", ignoring" << LL_ENDL;
+                                     << " found in static cache with bad size " << size << ", ignoring" << LL_ENDL;
         }
     }
     return false;
@@ -1402,7 +1402,7 @@ void LLAssetStorage::legacyGetDataCallback(const LLUUID &uuid,
         uuid.toString(uuid_str);
         filename = llformat("%s.%s",gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_str).c_str(),LLAssetType::lookup(type));
 
-        LLFILE* fp = LLFile::fopen(filename, "wb");     /* Flawfinder: ignore */
+        LLFILE* fp = LLFile::fopen(filename, LLFILE_MODE("wb")); /* Flawfinder: ignore */
         if (fp)
         {
             const S32 buf_size = 65536;
diff --git a/indra/llmessage/lltransfersourcefile.cpp b/indra/llmessage/lltransfersourcefile.cpp
index 77a6c466c7..d2d264c520 100644
--- a/indra/llmessage/lltransfersourcefile.cpp
+++ b/indra/llmessage/lltransfersourcefile.cpp
@@ -62,7 +62,7 @@ void LLTransferSourceFile::initTransfer()
         return;
     }
     // Look for the file.
-    mFP = LLFile::fopen(mParams.getFilename(), "rb");       /* Flawfinder: ignore */
+    mFP = LLFile::fopen(mParams.getFilename(), LLFILE_MODE("rb")); /* Flawfinder: ignore */
     if (!mFP)
     {
         sendTransferStatus(LLTS_ERROR);
diff --git a/indra/llmessage/lltransfertargetfile.cpp b/indra/llmessage/lltransfertargetfile.cpp
index 6d8b69fa6f..05dba219ed 100644
--- a/indra/llmessage/lltransfertargetfile.cpp
+++ b/indra/llmessage/lltransfertargetfile.cpp
@@ -75,7 +75,7 @@ LLTSCode LLTransferTargetFile::dataCallback(const S32 packet_id, U8 *in_datap, c
 
     if (!mFP)
     {
-        mFP = LLFile::fopen(mParams.mFilename, "wb");       /* Flawfinder: ignore */
+        mFP = LLFile::fopen(mParams.mFilename, LLFILE_MODE("wb")); /* Flawfinder: ignore */
 
         if (!mFP)
         {
diff --git a/indra/llmessage/llxfer_file.cpp b/indra/llmessage/llxfer_file.cpp
index 71b910297b..5f27cc4827 100644
--- a/indra/llmessage/llxfer_file.cpp
+++ b/indra/llmessage/llxfer_file.cpp
@@ -161,7 +161,7 @@ S32 LLXfer_File::initializeRequest(U64 xfer_id,
 S32 LLXfer_File::startDownload()
 {
     S32 retval = 0;  // presume success
-    mFp = LLFile::fopen(mTempFilename,"w+b");       /* Flawfinder : ignore */
+    mFp = LLFile::fopen(mTempFilename,LLFILE_MODE("w+b"));       /* Flawfinder : ignore */
     if (mFp)
     {
         fclose(mFp);
@@ -209,7 +209,7 @@ S32 LLXfer_File::startSend (U64 xfer_id, const LLHost &remote_host)
     mBufferStartOffset = 0;
 
     // We leave the file open, assuming we'll start reading and sending soon
-    mFp = LLFile::fopen(mLocalFilename,"rb");       /* Flawfinder : ignore */
+    mFp = LLFile::fopen(mLocalFilename, LLFILE_MODE("rb"));       /* Flawfinder : ignore */
     if (mFp)
     {
         fseek(mFp,0,SEEK_END);
@@ -252,7 +252,7 @@ S32 LLXfer_File::reopenFileHandle()
 
     if (mFp == NULL)
     {
-        mFp = LLFile::fopen(mLocalFilename,"rb");       /* Flawfinder : ignore */
+        mFp = LLFile::fopen(mLocalFilename, LLFILE_MODE("rb"));       /* Flawfinder : ignore */
         if (mFp == NULL)
         {
             LL_INFOS("Xfer") << "Warning: " << mLocalFilename << " not found when re-opening file" << LL_ENDL;
@@ -313,7 +313,7 @@ S32 LLXfer_File::flush()
         {
             LL_ERRS("Xfer") << "Overwriting open file pointer!" << LL_ENDL;
         }
-        mFp = LLFile::fopen(mTempFilename,"a+b");       /* Flawfinder : ignore */
+        mFp = LLFile::fopen(mTempFilename, LLFILE_MODE("a+b"));       /* Flawfinder : ignore */
 
         if (mFp)
         {
@@ -381,11 +381,11 @@ S32 LLXfer_File::processEOF()
             }
             else
             {
-                //LLFILE* fp = LLFile::fopen(mTempFilename, "r");
+                //LLFILE* fp = LLFile::fopen(mTempFilename, LLFILE_MODE("r"));
                 //LL_WARNS() << "File " << mTempFilename << " does "
                 //      << (!fp ? "not" : "" ) << " exit." << LL_ENDL;
                 //if(fp) fclose(fp);
-                //fp = LLFile::fopen(mLocalFilename, "r");
+                //fp = LLFile::fopen(mLocalFilename, LLFILE_MODE("r"));
                 //LL_WARNS() << "File " << mLocalFilename << " does "
                 //      << (!fp ? "not" : "" ) << " exit." << LL_ENDL;
                 //if(fp) fclose(fp);
@@ -452,8 +452,8 @@ U32 LLXfer_File::getXferTypeTag()
 S32 copy_file(const std::string& from, const std::string& to)
 {
     S32 rv = 0;
-    LLFILE* in = LLFile::fopen(from, "rb"); /*Flawfinder: ignore*/
-    LLFILE* out = LLFile::fopen(to, "wb");  /*Flawfinder: ignore*/
+    LLFILE* in = LLFile::fopen(from, LLFILE_MODE("rb")); /*Flawfinder: ignore*/
+    LLFILE* out = LLFile::fopen(to, LLFILE_MODE("wb"));  /*Flawfinder: ignore*/
     if(in && out)
     {
         S32 read = 0;
diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp
index e2937490ba..df58c8a7f3 100644
--- a/indra/llmessage/message.cpp
+++ b/indra/llmessage/message.cpp
@@ -2376,7 +2376,7 @@ void dump_prehash_files()
 {
     U32 i;
     std::string filename("../../indra/llmessage/message_prehash.h");
-    LLFILE* fp = LLFile::fopen(filename, "w");  /* Flawfinder: ignore */
+    LLFILE* fp = LLFile::fopen(filename, LLFILE_MODE("w"));  /* Flawfinder: ignore */
     if (fp)
     {
         fprintf(
@@ -2407,7 +2407,7 @@ void dump_prehash_files()
         fclose(fp);
     }
     filename = std::string("../../indra/llmessage/message_prehash.cpp");
-    fp = LLFile::fopen(filename, "w");  /* Flawfinder: ignore */
+    fp = LLFile::fopen(filename, LLFILE_MODE("w"));  /* Flawfinder: ignore */
     if (fp)
     {
         fprintf(
diff --git a/indra/llmessage/tests/lldatapacker_test.cpp b/indra/llmessage/tests/lldatapacker_test.cpp
index 746817936d..5823980d43 100644
--- a/indra/llmessage/tests/lldatapacker_test.cpp
+++ b/indra/llmessage/tests/lldatapacker_test.cpp
@@ -348,7 +348,7 @@ namespace tut
     {
         F32 f_val = 44.44f, f_unpkval;
 
-        LLFILE* fp = LLFile::fopen(TEST_FILE_NAME, "w+");
+        LLFILE* fp = LLFile::fopen(TEST_FILE_NAME, LLFILE_MODE("w+"));
         if(!fp)
         {
             LL_ERRS() << "File couldnt be open" << LL_ENDL;
@@ -403,7 +403,7 @@ namespace tut
         LLVector4 unpkllvec4;
         LLUUID unpkuuid;
 
-        LLFILE* fp = LLFile::fopen(TEST_FILE_NAME,"w+");
+        LLFILE* fp = LLFile::fopen(TEST_FILE_NAME, LLFILE_MODE("w+"));
         if(!fp)
         {
             LL_ERRS() << "File couldnt be open" << LL_ENDL;
diff --git a/indra/llmessage/tests/llmessageconfig_test.cpp b/indra/llmessage/tests/llmessageconfig_test.cpp
index 93443467a2..b8942e99b3 100644
--- a/indra/llmessage/tests/llmessageconfig_test.cpp
+++ b/indra/llmessage/tests/llmessageconfig_test.cpp
@@ -62,7 +62,7 @@ namespace tut
             int rmfile = LLFile::remove((mTestConfigDir + "/message.xml"));
             ensure_equals("rmfile value", rmfile, 0);
             // rm temp dir
-            int rmdir = LLFile::rmdir(mTestConfigDir);
+            int rmdir = LLFile::remove(mTestConfigDir);
             ensure_equals("rmdir value", rmdir, 0);
         }
 
diff --git a/indra/llmessage/tests/message_test.cpp b/indra/llmessage/tests/message_test.cpp
index 11cd710ef6..6fb2b92803 100644
--- a/indra/llmessage/tests/message_test.cpp
+++ b/indra/llmessage/tests/message_test.cpp
@@ -113,7 +113,7 @@ namespace tut
             ensure_equals("rmfile value", rmfile, 0);
 
             // rm temp dir
-            int rmdir = LLFile::rmdir(mTestConfigDir);
+            int rmdir = LLFile::remove(mTestConfigDir);
             ensure_equals("rmdir value", rmdir, 0);
         }