diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-04-20 20:21:20 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-04-20 20:21:20 +0300 |
| commit | 66502df0502f1c2aa6aa9fda0a2a61921535a645 (patch) | |
| tree | d37316b63ed6175158fddd10195f9a9d7a8f0d0f /indra/llcommon | |
| parent | 449a4f9b0653dc74133fbb18502c00a9398bfebb (diff) | |
MAINT-8540 Eliminated a lot of xui related log warnings on startup and opening preferences
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llfile.cpp | 4 | ||||
| -rw-r--r-- | indra/llcommon/llfile.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llfile.cpp b/indra/llcommon/llfile.cpp index 8aa41035b9..fc203f78e1 100644 --- a/indra/llcommon/llfile.cpp +++ b/indra/llcommon/llfile.cpp @@ -258,7 +258,7 @@ int LLFile::remove(const std::string& filename, int supress_error) return warnif("remove", filename, rc, supress_error); } -int LLFile::rename(const std::string& filename, const std::string& newname) +int LLFile::rename(const std::string& filename, const std::string& newname, int supress_error) { #if LL_WINDOWS std::string utf8filename = filename; @@ -269,7 +269,7 @@ int LLFile::rename(const std::string& filename, const std::string& newname) #else int rc = ::rename(filename.c_str(),newname.c_str()); #endif - return warnif(STRINGIZE("rename to '" << newname << "' from"), filename, rc); + return warnif(STRINGIZE("rename to '" << newname << "' from"), filename, rc, supress_error); } bool LLFile::copy(const std::string from, const std::string to) diff --git a/indra/llcommon/llfile.h b/indra/llcommon/llfile.h index ba935b8714..398938b729 100644 --- a/indra/llcommon/llfile.h +++ b/indra/llcommon/llfile.h @@ -74,7 +74,7 @@ public: static int rmdir(const std::string& filename); static int remove(const std::string& filename, int supress_error = 0); - static int rename(const std::string& filename,const std::string& newname); + static int rename(const std::string& filename,const std::string& newname, int supress_error = 0); static bool copy(const std::string from, const std::string to); static int stat(const std::string& filename,llstat* file_status); |