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
87908bab
Commit
87908bab
authored
4 years ago
by
Mnikolenko Productengine
Browse files
Options
Downloads
Patches
Plain Diff
SL-14939 Fixed the log spam
parent
925feaaf
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
doc/contributions.txt
+1
-0
1 addition, 0 deletions
doc/contributions.txt
indra/llfilesystem/llfilesystem.cpp
+3
-3
3 additions, 3 deletions
indra/llfilesystem/llfilesystem.cpp
indra/llfilesystem/llfilesystem.h
+1
-1
1 addition, 1 deletion
indra/llfilesystem/llfilesystem.h
with
5 additions
and
4 deletions
doc/contributions.txt
+
1
−
0
View file @
87908bab
...
...
@@ -226,6 +226,7 @@ Ansariel Hiller
SL-13364
SL-13858
SL-13697
SL-14939
SL-14941
Aralara Rajal
Arare Chantilly
...
...
This diff is collapsed.
Click to expand it.
indra/llfilesystem/llfilesystem.cpp
+
3
−
3
View file @
87908bab
...
...
@@ -72,14 +72,14 @@ bool LLFileSystem::getExists(const LLUUID& file_id, const LLAssetType::EType fil
}
// static
bool
LLFileSystem
::
removeFile
(
const
LLUUID
&
file_id
,
const
LLAssetType
::
EType
file_type
)
bool
LLFileSystem
::
removeFile
(
const
LLUUID
&
file_id
,
const
LLAssetType
::
EType
file_type
,
int
suppress_error
/*= 0*/
)
{
std
::
string
id_str
;
file_id
.
toString
(
id_str
);
const
std
::
string
extra_info
=
""
;
const
std
::
string
filename
=
LLDiskCache
::
getInstance
()
->
metaDataToFilepath
(
id_str
,
file_type
,
extra_info
);
LLFile
::
remove
(
filename
.
c_str
());
LLFile
::
remove
(
filename
.
c_str
()
,
suppress_error
);
return
true
;
}
...
...
@@ -98,7 +98,7 @@ bool LLFileSystem::renameFile(const LLUUID& old_file_id, const LLAssetType::ETyp
const
std
::
string
new_filename
=
LLDiskCache
::
getInstance
()
->
metaDataToFilepath
(
new_id_str
,
new_file_type
,
extra_info
);
// Rename needs the new file to not exist.
LLFileSystem
::
removeFile
(
new_file_id
,
new_file_type
);
LLFileSystem
::
removeFile
(
new_file_id
,
new_file_type
,
ENOENT
);
if
(
LLFile
::
rename
(
old_filename
,
new_filename
)
!=
0
)
{
...
...
This diff is collapsed.
Click to expand it.
indra/llfilesystem/llfilesystem.h
+
1
−
1
View file @
87908bab
...
...
@@ -54,7 +54,7 @@ class LLFileSystem
BOOL
remove
();
static
bool
getExists
(
const
LLUUID
&
file_id
,
const
LLAssetType
::
EType
file_type
);
static
bool
removeFile
(
const
LLUUID
&
file_id
,
const
LLAssetType
::
EType
file_type
);
static
bool
removeFile
(
const
LLUUID
&
file_id
,
const
LLAssetType
::
EType
file_type
,
int
suppress_error
=
0
);
static
bool
renameFile
(
const
LLUUID
&
old_file_id
,
const
LLAssetType
::
EType
old_file_type
,
const
LLUUID
&
new_file_id
,
const
LLAssetType
::
EType
new_file_type
);
static
S32
getFileSize
(
const
LLUUID
&
file_id
,
const
LLAssetType
::
EType
file_type
);
...
...
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