From 5206bf999a2b2fc4ef69d649177e5be285b05251 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sun, 18 Oct 2015 23:52:28 +0200
Subject: [PATCH] Backed out changeset c6d43bf65bd5 because I was wrong - or
 rather LL's code comments are

---
 indra/newview/llfavoritesbar.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
index 7d8e84e84e..769a15ba09 100755
--- a/indra/newview/llfavoritesbar.cpp
+++ b/indra/newview/llfavoritesbar.cpp
@@ -1640,12 +1640,7 @@ void LLFavoritesOrderStorage::load()
 				in_file.close();
 				// <FS:Ansariel> FIRE-10122 - User@grid stored_favorites.xml
 				//user_llsd = fav_llsd[gAgentUsername];
-				std::string username = gAgentUsername;
-				if (username.find(" ") == std::string::npos)
-				{
-					username += " Resident";
-				}
-				user_llsd = fav_llsd[username + " @ " + LLGridManager::getInstance()->getGridLabel()];
+				user_llsd = fav_llsd[gAgentUsername + " @ " + LLGridManager::getInstance()->getGridLabel()];
 				// </FS:Ansariel>
 
 				S32 index = 0;