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
b96d890c
Commit
b96d890c
authored
16 years ago
by
Christian Goetze
Browse files
Options
Downloads
Patches
Plain Diff
QAR-1141 svn merge -r107086:107087
svn+ssh://svn.lindenlab.com/svn/user/cg/llvfs-fix-2
parent
36645d1c
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
indra/llvfs/lldir.cpp
+27
-13
27 additions, 13 deletions
indra/llvfs/lldir.cpp
indra/llvfs/lldir.h
+4
-0
4 additions, 0 deletions
indra/llvfs/lldir.h
indra/llvfs/lldir_win32.cpp
+14
-0
14 additions, 0 deletions
indra/llvfs/lldir_win32.cpp
with
45 additions
and
13 deletions
indra/llvfs/lldir.cpp
+
27
−
13
View file @
b96d890c
...
@@ -214,6 +214,23 @@ const std::string &LLDir::getTempDir() const
...
@@ -214,6 +214,23 @@ const std::string &LLDir::getTempDir() const
const
std
::
string
LLDir
::
getCacheDir
(
bool
get_default
)
const
const
std
::
string
LLDir
::
getCacheDir
(
bool
get_default
)
const
{
{
if
(
mCacheDir
.
empty
()
||
get_default
)
if
(
mCacheDir
.
empty
()
||
get_default
)
{
if
(
!
mDefaultCacheDir
.
empty
())
{
// Set at startup - can't set here due to const API
return
mDefaultCacheDir
;
}
std
::
string
res
=
buildSLOSCacheDir
();
return
res
;
}
else
{
return
mCacheDir
;
}
}
// Return the default cache directory
std
::
string
LLDir
::
buildSLOSCacheDir
()
const
{
{
std
::
string
res
;
std
::
string
res
;
if
(
getOSCacheDir
().
empty
())
if
(
getOSCacheDir
().
empty
())
...
@@ -233,11 +250,8 @@ const std::string LLDir::getCacheDir(bool get_default) const
...
@@ -233,11 +250,8 @@ const std::string LLDir::getCacheDir(bool get_default) const
}
}
return
res
;
return
res
;
}
}
else
{
return
mCacheDir
;
}
}
const
std
::
string
&
LLDir
::
getOSCacheDir
()
const
const
std
::
string
&
LLDir
::
getOSCacheDir
()
const
{
{
...
...
This diff is collapsed.
Click to expand it.
indra/llvfs/lldir.h
+
4
−
0
View file @
b96d890c
...
@@ -126,6 +126,9 @@ class LLDir
...
@@ -126,6 +126,9 @@ class LLDir
virtual
void
dumpCurrentDirectories
();
virtual
void
dumpCurrentDirectories
();
// Utility routine
std
::
string
buildSLOSCacheDir
()
const
;
protected:
protected:
std
::
string
mAppName
;
// install directory under progams/ ie "SecondLife"
std
::
string
mAppName
;
// install directory under progams/ ie "SecondLife"
std
::
string
mExecutablePathAndName
;
// full path + Filename of .exe
std
::
string
mExecutablePathAndName
;
// full path + Filename of .exe
...
@@ -141,6 +144,7 @@ class LLDir
...
@@ -141,6 +144,7 @@ class LLDir
std
::
string
mCAFile
;
// Location of the TLS certificate authority PEM file.
std
::
string
mCAFile
;
// Location of the TLS certificate authority PEM file.
std
::
string
mTempDir
;
std
::
string
mTempDir
;
std
::
string
mCacheDir
;
// cache directory as set by user preference
std
::
string
mCacheDir
;
// cache directory as set by user preference
std
::
string
mDefaultCacheDir
;
// default cache diretory
std
::
string
mOSCacheDir
;
// operating system cache dir
std
::
string
mOSCacheDir
;
// operating system cache dir
std
::
string
mDirDelimiter
;
std
::
string
mDirDelimiter
;
std
::
string
mSkinDir
;
// Location for current skin info.
std
::
string
mSkinDir
;
// Location for current skin info.
...
...
This diff is collapsed.
Click to expand it.
indra/llvfs/lldir_win32.cpp
+
14
−
0
View file @
b96d890c
...
@@ -128,6 +128,20 @@ LLDir_Win32::LLDir_Win32()
...
@@ -128,6 +128,20 @@ LLDir_Win32::LLDir_Win32()
mAppRODataDir
=
getCurPath
();
mAppRODataDir
=
getCurPath
();
else
else
mAppRODataDir
=
mExecutableDir
;
mAppRODataDir
=
mExecutableDir
;
// Build the default cache directory
mDefaultCacheDir
=
buildSLOSCacheDir
();
// Make sure it exists
int
res
=
LLFile
::
mkdir
(
mDefaultCacheDir
);
if
(
res
==
-
1
)
{
if
(
errno
!=
EEXIST
)
{
llwarns
<<
"Couldn't create LL_PATH_CACHE dir "
<<
mDefaultCacheDir
<<
llendl
;
}
}
}
}
LLDir_Win32
::~
LLDir_Win32
()
LLDir_Win32
::~
LLDir_Win32
()
...
...
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