aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra')
-rw-r--r--linden/indra/newview/llpanelnetwork.cpp2
-rw-r--r--linden/indra/newview/lltexturecache.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/newview/llpanelnetwork.cpp b/linden/indra/newview/llpanelnetwork.cpp
index 2edd1a1..ec0b6ee 100644
--- a/linden/indra/newview/llpanelnetwork.cpp
+++ b/linden/indra/newview/llpanelnetwork.cpp
@@ -127,7 +127,7 @@ void LLPanelNetwork::onClickResetCache(void* user_data)
127 LLPanelNetwork* self = (LLPanelNetwork*)user_data; 127 LLPanelNetwork* self = (LLPanelNetwork*)user_data;
128 if (!gSavedSettings.getString("CacheLocation").empty()) 128 if (!gSavedSettings.getString("CacheLocation").empty())
129 { 129 {
130 gSavedSettings.setString("NewCacheLocation", ""); 130 gSavedSettings.setString("NewCacheLocation", gDirUtilp->getCacheDir(true));
131 LLNotifications::instance().add("CacheWillBeMoved"); 131 LLNotifications::instance().add("CacheWillBeMoved");
132 } 132 }
133 std::string cache_location = gDirUtilp->getCacheDir(true); 133 std::string cache_location = gDirUtilp->getCacheDir(true);
diff --git a/linden/indra/newview/lltexturecache.cpp b/linden/indra/newview/lltexturecache.cpp
index a1a9a39..4679137 100644
--- a/linden/indra/newview/lltexturecache.cpp
+++ b/linden/indra/newview/lltexturecache.cpp
@@ -800,6 +800,8 @@ std::string LLTextureCache::getLocalFileName(const LLUUID& id)
800 // Does not include extension 800 // Does not include extension
801 std::string idstr = id.asString(); 801 std::string idstr = id.asString();
802 // TODO: should we be storing cached textures in skin directory? 802 // TODO: should we be storing cached textures in skin directory?
803 //We use LL_PATH_SKINS because the default textures (water normal map etc) are delivered in the SKINS path.
804 //Turns out we can't change this to LL_PATH_CACHE or these important textures will be removed when the user clears their cache.
803 std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, "default", "textures", idstr); 805 std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, "default", "textures", idstr);
804 return filename; 806 return filename;
805} 807}