summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-02-13 15:35:23 -0800
committerMerov Linden <merov@lindenlab.com>2013-02-13 15:35:23 -0800
commit2f49f5ed0e03375df97c877f139f2283f1a1376d (patch)
tree3d94dd946d169db7116cb989b1ea88422653637c /indra/newview
parenta9f7c0089fe0a94879e5a9ad31cd6f8b5fb51c36 (diff)
CHUI-770 : Fixed! Need to use the User Name and not the Account Name to save the favorites.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfavoritesbar.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
index ba3d4036c9..e30dd51acb 100644
--- a/indra/newview/llfavoritesbar.cpp
+++ b/indra/newview/llfavoritesbar.cpp
@@ -1520,8 +1520,10 @@ void LLFavoritesOrderStorage::saveFavoritesSLURLs()
LLAvatarName av_name;
LLAvatarNameCache::get( gAgentID, &av_name );
- lldebugs << "Saved favorites for " << av_name.getAccountName() << llendl;
- fav_llsd[av_name.getAccountName()] = user_llsd;
+ // Note : use the "John Doe" and not the "john.doe" version of the name
+ // as we'll compare it with the stored credentials in the login panel.
+ lldebugs << "Saved favorites for " << av_name.getUserName() << llendl;
+ fav_llsd[av_name.getUserName()] = user_llsd;
llofstream file;
file.open(filename);
@@ -1539,10 +1541,12 @@ void LLFavoritesOrderStorage::removeFavoritesRecordOfUser()
LLAvatarName av_name;
LLAvatarNameCache::get( gAgentID, &av_name );
- lldebugs << "Removed favorites for " << av_name.getAccountName() << llendl;
- if (fav_llsd.has(av_name.getAccountName()))
+ // Note : use the "John Doe" and not the "john.doe" version of the name.
+ // See saveFavoritesSLURLs() here above for the reason why.
+ lldebugs << "Removed favorites for " << av_name.getUserName() << llendl;
+ if (fav_llsd.has(av_name.getUserName()))
{
- fav_llsd.erase(av_name.getAccountName());
+ fav_llsd.erase(av_name.getUserName());
}
llofstream out_file;