From dee48496166e44f0e9b13a6c0b348d3409ddf0e5 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Tue, 1 Dec 2009 11:26:43 -0800 Subject: EXT-2635 No message reminding user that a restart is required to reset cache (was Clear Cache) EXT-2652 Favorites bar drop-down button (for when favorites exceed width of viewer) is not configurable via XUI EXT-2227 [BSI] Preferences -> Setup -> Cache Location blank EXT-1036 Clicking menu separators selects wrong menu option (allows selection of greyed-out option) reviewed by James --- indra/newview/llfloaterpreference.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'indra/newview/llfloaterpreference.cpp') diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 83c784c1f7..a6ecb4c127 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -367,6 +367,10 @@ BOOL LLFloaterPreference::postBuild() tabcontainer->selectFirstTab(); S32 show_avatar_nametag_options = gSavedSettings.getS32("AvatarNameTagMode"); handleNameTagOptionChanged(LLSD(show_avatar_nametag_options)); + + std::string cache_location = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, ""); + childSetText("cache_location", cache_location); + return TRUE; } @@ -760,8 +764,9 @@ void LLFloaterPreference::onClickResetCache() { gSavedSettings.setString("NewCacheLocation", ""); gSavedSettings.setString("NewCacheLocationTopFolder", ""); - LLNotificationsUtil::add("CacheWillBeMoved"); } + + LLNotificationsUtil::add("CacheWillBeMoved"); std::string cache_location = gDirUtilp->getCacheDir(true); gSavedSettings.setString("CacheLocation", cache_location); std::string top_folder(gDirUtilp->getBaseFileName(cache_location)); -- cgit v1.2.3