Port Viewer 2 indra/llvfs
This introduces some API changes, like the new LLDirIterator, that causes changes elsewhere. It also include Log Linden's cache changes that aren't in viewer-development yet that increase the maximum cache size to ~10 GB.
This commit is contained in:
@@ -186,12 +186,14 @@ void LLPanelNetwork::onClickSetCache_continued(void* user_data, AIDirPicker* dir
|
||||
void LLPanelNetwork::onClickResetCache(void* user_data)
|
||||
{
|
||||
LLPanelNetwork* self = (LLPanelNetwork*)user_data;
|
||||
if (!gSavedSettings.getString("CacheLocation").empty())
|
||||
if (gDirUtilp->getCacheDir(false) == gDirUtilp->getCacheDir(true))
|
||||
{
|
||||
gSavedSettings.setString("NewCacheLocation", "");
|
||||
LLNotifications::instance().add("CacheWillBeMoved");
|
||||
// The cache location was already the default.
|
||||
return;
|
||||
}
|
||||
std::string cache_location = gDirUtilp->getCacheDir(true);
|
||||
gSavedSettings.setString("NewCacheLocation", "");
|
||||
LLNotifications::instance().add("CacheWillBeMoved");
|
||||
std::string cache_location = gDirUtilp->getCacheDir(false);
|
||||
self->childSetText("cache_location", cache_location);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user