summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2016-05-17 17:05:59 +0300
committerandreykproductengine <akleshchev@productengine.com>2016-05-17 17:05:59 +0300
commite795fee86448970881066af95de7eac8e4847d14 (patch)
tree4eefe06761e89fa437423d4f7e5dba6da5359a75 /indra
parent191c2aec49491c74a6ce9b23a813dc89d63f2c6a (diff)
MAINT-6409 texture_list xml file should be in cache.
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llviewertexturelist.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index 5cfd04b4c1..766164ebf8 100755
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -182,7 +182,7 @@ void LLViewerTextureList::doPreloadImages()
static std::string get_texture_list_name()
{
- return gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "texture_list_" + gSavedSettings.getString("LoginLocation") + ".xml");
+ return gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "texture_list_" + gSavedSettings.getString("LoginLocation") + "." + gDirUtilp->getUserName() + ".xml");
}
void LLViewerTextureList::doPrefetchImages()
@@ -287,7 +287,7 @@ void LLViewerTextureList::shutdown()
break;
}
- if (count > 0 && !gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "").empty())
+ if (count > 0 && !gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "").empty())
{
std::string filename = get_texture_list_name();
llofstream file;