Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
12d8804b
Commit
12d8804b
authored
4 years ago
by
Rye Mutt
Browse files
Options
Downloads
Patches
Plain Diff
Fix annoying warning spam when renaming an LLFileSystem file when new file does not actually exist
parent
56b504b0
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/llfilesystem/llfilesystem.cpp
+2
-2
2 additions, 2 deletions
indra/llfilesystem/llfilesystem.cpp
with
2 additions
and
2 deletions
indra/llfilesystem/llfilesystem.cpp
+
2
−
2
View file @
12d8804b
...
...
@@ -64,7 +64,7 @@ bool LLFileSystem::removeFile(const LLUUID& file_id, const LLAssetType::EType fi
{
const
std
::
string
filename
=
LLDiskCache
::
getInstance
()
->
metaDataToFilepath
(
file_id
,
file_type
);
LLFile
::
remove
(
filename
.
c_str
()
);
LLFile
::
remove
(
filename
,
ENOENT
);
return
true
;
}
...
...
@@ -77,7 +77,7 @@ bool LLFileSystem::renameFile(const LLUUID& old_file_id, const LLAssetType::ETyp
const
std
::
string
new_filename
=
LLDiskCache
::
getInstance
()
->
metaDataToFilepath
(
new_file_id
,
new_file_type
);
// Rename needs the new file to not exist.
LLFile
System
::
remove
File
(
new_file
_id
,
new_file_type
);
LLFile
::
remove
(
new_file
name
,
ENOENT
);
if
(
LLFile
::
rename
(
old_filename
,
new_filename
)
!=
0
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment