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.

1 files changed, 4 insertions, 1 deletions

diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index c95a2472a7..4522d9e6eb 100644
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -152,6 +152,8 @@ public:
 	
 	void buildPopupLists();
 	static void refreshSkin(void* data);
+	// Remove record of current user's favorites from file on disk.
+	void removeFavoritesRecordOfUser();
 private:
 	static std::string sSkin;
 	// set true if state of double-click action checkbox or radio-group was changed by user
@@ -162,7 +164,8 @@ private:
 	bool mLanguageChanged;
 	
 	bool mOriginalHideOnlineStatus;
-	bool mFavoritesFileMayExist;
+	// Record of current user's favorites may be stored in file on disk.
+	bool mFavoritesRecordMayExist;
 	std::string mDirectoryVisibility;
 };