diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-12-17 14:16:47 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-12-17 14:16:47 -0800 |
| commit | 09163617c2c5e79d8e51b5ceca5b5282effcb1f6 (patch) | |
| tree | 00ca15b9d3f3c336ac357413c38f87028ba4e1ee /indra/newview/llfavoritesbar.cpp | |
| parent | e8bff548ff7374c263c2bc38a337e8841bc2761f (diff) | |
| parent | ed52792396c76ead787207b7a7dc3968f4352a1d (diff) | |
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui.
Diffstat (limited to 'indra/newview/llfavoritesbar.cpp')
| -rw-r--r-- | indra/newview/llfavoritesbar.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp index ff0e01a200..ba3d4036c9 100644 --- a/indra/newview/llfavoritesbar.cpp +++ b/indra/newview/llfavoritesbar.cpp @@ -1520,8 +1520,8 @@ void LLFavoritesOrderStorage::saveFavoritesSLURLs() LLAvatarName av_name; LLAvatarNameCache::get( gAgentID, &av_name ); - lldebugs << "Saved favorites for " << av_name.getUserName() << llendl; - fav_llsd[av_name.getUserName()] = user_llsd; + lldebugs << "Saved favorites for " << av_name.getAccountName() << llendl; + fav_llsd[av_name.getAccountName()] = user_llsd; llofstream file; file.open(filename); @@ -1539,10 +1539,10 @@ void LLFavoritesOrderStorage::removeFavoritesRecordOfUser() LLAvatarName av_name; LLAvatarNameCache::get( gAgentID, &av_name ); - lldebugs << "Removed favorites for " << av_name.getUserName() << llendl; - if (fav_llsd.has(av_name.getUserName())) + lldebugs << "Removed favorites for " << av_name.getAccountName() << llendl; + if (fav_llsd.has(av_name.getAccountName())) { - fav_llsd.erase(av_name.getUserName()); + fav_llsd.erase(av_name.getAccountName()); } llofstream out_file; |