summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturecache.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-06-01 22:07:12 -0400
committerOz Linden <oz@lindenlab.com>2011-06-01 22:07:12 -0400
commit8bfd3201de0d135ef984dc270e83ea88d8f03dd6 (patch)
tree040272fc843ed2b00c9b9b162dad9fa503ef078a /indra/newview/lltexturecache.cpp
parent68088a27ba92d8a3ce84ee6e5691e9e2e08b7b32 (diff)
parent361384ebb9f41dbccbaab779a085edb773f0a734 (diff)
merge changes for latest viewer-development
Diffstat (limited to 'indra/newview/lltexturecache.cpp')
-rw-r--r--indra/newview/lltexturecache.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp
index 7fb52c1939..faab6ac002 100644
--- a/indra/newview/lltexturecache.cpp
+++ b/indra/newview/lltexturecache.cpp
@@ -1513,12 +1513,12 @@ void LLTextureCache::purgeAllTextures(bool purge_directories)
{
const char* subdirs = "0123456789abcdef";
std::string delem = gDirUtilp->getDirDelimiter();
- std::string mask = delem + "*";
+ std::string mask = "*";
for (S32 i=0; i<16; i++)
{
std::string dirname = mTexturesDirName + delem + subdirs[i];
llinfos << "Deleting files in directory: " << dirname << llendl;
- gDirUtilp->deleteFilesInDir(dirname,mask);
+ gDirUtilp->deleteFilesInDir(dirname, mask);
if (purge_directories)
{
LLFile::rmdir(dirname);