summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerinventory.cpp
diff options
context:
space:
mode:
authorAndrew Productengine <adyukov@productengine.com>2010-12-23 18:15:54 +0200
committerAndrew Productengine <adyukov@productengine.com>2010-12-23 18:15:54 +0200
commitc02d6a319f378d5dcc34c51b20f556f175d2a40a (patch)
tree5b6faeb8961c6d77f3d54b6dbc6c525773d9a0fa /indra/newview/llviewerinventory.cpp
parent32750132db47eb335c56f6c880902cf7195e1825 (diff)
STORM-34 ADDITIONAL_FIX Made saving favorites in file per-account preference instead of per-machine.
- Made changes in code of floater preferences and panel login that were required because of turning the setting per-account. - Added new method to LLFloaterPreference that looks for current user's record in saved favorites file and removes it.
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
-rw-r--r--indra/newview/llviewerinventory.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 4fa79b1855..9c7ef7922b 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -1527,7 +1527,7 @@ void LLFavoritesOrderStorage::getSLURL(const LLUUID& asset_id)
void LLFavoritesOrderStorage::destroyClass()
{
LLFavoritesOrderStorage::instance().cleanup();
- if (gSavedSettings.getBOOL("ShowFavoritesOnLogin"))
+ if (gSavedPerAccountSettings.getBOOL("ShowFavoritesOnLogin"))
{
LLFavoritesOrderStorage::instance().saveFavoritesSLURLs();
}