Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
XDG Integration
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
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
JennaHuntsman
XDG Integration
Commits
43fbd41b
Commit
43fbd41b
authored
4 years ago
by
Andrey Lihatskiy
Browse files
Options
Downloads
Patches
Plain Diff
Revert "SL-14939 Fixed the log spam"
This reverts commit
b1ab29ee
.
parent
3067f56b
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
doc/contributions.txt
+0
-1
0 additions, 1 deletion
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
4 additions
and
5 deletions
doc/contributions.txt
+
0
−
1
View file @
43fbd41b
...
@@ -226,7 +226,6 @@ Ansariel Hiller
...
@@ -226,7 +226,6 @@ Ansariel Hiller
SL-13364
SL-13364
SL-13858
SL-13858
SL-13697
SL-13697
SL-14939
Aralara Rajal
Aralara Rajal
Arare Chantilly
Arare Chantilly
CHUIBUG-191
CHUIBUG-191
...
...
This diff is collapsed.
Click to expand it.
indra/llfilesystem/llfilesystem.cpp
+
3
−
3
View file @
43fbd41b
...
@@ -72,14 +72,14 @@ bool LLFileSystem::getExists(const LLUUID& file_id, const LLAssetType::EType fil
...
@@ -72,14 +72,14 @@ bool LLFileSystem::getExists(const LLUUID& file_id, const LLAssetType::EType fil
}
}
// static
// static
bool
LLFileSystem
::
removeFile
(
const
LLUUID
&
file_id
,
const
LLAssetType
::
EType
file_type
,
int
suppress_error
/*= 0*/
)
bool
LLFileSystem
::
removeFile
(
const
LLUUID
&
file_id
,
const
LLAssetType
::
EType
file_type
)
{
{
std
::
string
id_str
;
std
::
string
id_str
;
file_id
.
toString
(
id_str
);
file_id
.
toString
(
id_str
);
const
std
::
string
extra_info
=
""
;
const
std
::
string
extra_info
=
""
;
const
std
::
string
filename
=
LLDiskCache
::
getInstance
()
->
metaDataToFilepath
(
id_str
,
file_type
,
extra_info
);
const
std
::
string
filename
=
LLDiskCache
::
getInstance
()
->
metaDataToFilepath
(
id_str
,
file_type
,
extra_info
);
LLFile
::
remove
(
filename
.
c_str
()
,
suppress_error
);
LLFile
::
remove
(
filename
.
c_str
());
return
true
;
return
true
;
}
}
...
@@ -98,7 +98,7 @@ bool LLFileSystem::renameFile(const LLUUID& old_file_id, const LLAssetType::ETyp
...
@@ -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
);
const
std
::
string
new_filename
=
LLDiskCache
::
getInstance
()
->
metaDataToFilepath
(
new_id_str
,
new_file_type
,
extra_info
);
// Rename needs the new file to not exist.
// Rename needs the new file to not exist.
LLFileSystem
::
removeFile
(
new_file_id
,
new_file_type
,
ENOENT
);
LLFileSystem
::
removeFile
(
new_file_id
,
new_file_type
);
if
(
LLFile
::
rename
(
old_filename
,
new_filename
)
!=
0
)
if
(
LLFile
::
rename
(
old_filename
,
new_filename
)
!=
0
)
{
{
...
...
This diff is collapsed.
Click to expand it.
indra/llfilesystem/llfilesystem.h
+
1
−
1
View file @
43fbd41b
...
@@ -54,7 +54,7 @@ class LLFileSystem
...
@@ -54,7 +54,7 @@ class LLFileSystem
BOOL
remove
();
BOOL
remove
();
static
bool
getExists
(
const
LLUUID
&
file_id
,
const
LLAssetType
::
EType
file_type
);
static
bool
getExists
(
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
removeFile
(
const
LLUUID
&
file_id
,
const
LLAssetType
::
EType
file_type
);
static
bool
renameFile
(
const
LLUUID
&
old_file_id
,
const
LLAssetType
::
EType
old_file_type
,
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
);
const
LLUUID
&
new_file_id
,
const
LLAssetType
::
EType
new_file_type
);
static
S32
getFileSize
(
const
LLUUID
&
file_id
,
const
LLAssetType
::
EType
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