From 15669281faab727cdf79ec1cee24d9b20fae8cbd Mon Sep 17 00:00:00 2001 From: Mike Mazur Date: Thu, 31 Jul 2008 23:53:24 +0000 Subject: Apply updated patch from issue 1871. Thanks sempuki. --- .../Framework/Communications/UserManagerBase.cs | 50 +++++++++++----------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'OpenSim/Framework/Communications/UserManagerBase.cs') diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index f8e77df..05077b6 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs @@ -47,7 +47,7 @@ namespace OpenSim.Framework.Communications = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); public UserConfig _config; - private List _plugins = new List(); + private List _plugins = new List(); /// /// Adds a new user server plugin - user servers will be requested in the order they were loaded. @@ -55,8 +55,8 @@ namespace OpenSim.Framework.Communications /// The filename to the user server plugin DLL public void AddPlugin(string provider, string connect) { - PluginLoader loader = - new PluginLoader (new UserDataInitialiser (connect)); + PluginLoader loader = + new PluginLoader (new UserDataInitialiser (connect)); // loader will try to load all providers (MySQL, MSSQL, etc) // unless it is constrainted to the correct "Provider" entry in the addin.xml @@ -71,7 +71,7 @@ namespace OpenSim.Framework.Communications // see IUserService public UserProfileData GetUserProfile(string fname, string lname) { - foreach (IUserData plugin in _plugins) + foreach (IUserDataPlugin plugin in _plugins) { UserProfileData profile = plugin.GetUserByName(fname, lname); @@ -86,7 +86,7 @@ namespace OpenSim.Framework.Communications } public UserAgentData GetAgentByUUID(LLUUID userId) { - foreach (IUserData plugin in _plugins) + foreach (IUserDataPlugin plugin in _plugins) { UserAgentData agent = plugin.GetAgentByUUID(userId); @@ -101,7 +101,7 @@ namespace OpenSim.Framework.Communications // see IUserService public UserProfileData GetUserProfile(LLUUID uuid) { - foreach (IUserData plugin in _plugins) + foreach (IUserDataPlugin plugin in _plugins) { UserProfileData profile = plugin.GetUserByUUID(uuid); @@ -118,7 +118,7 @@ namespace OpenSim.Framework.Communications public List GenerateAgentPickerRequestResponse(LLUUID queryID, string query) { List pickerlist = new List(); - foreach (IUserData plugin in _plugins) + foreach (IUserDataPlugin plugin in _plugins) { try { @@ -140,7 +140,7 @@ namespace OpenSim.Framework.Communications /// public bool UpdateUserProfile(UserProfileData data) { - foreach (IUserData plugin in _plugins) + foreach (IUserDataPlugin plugin in _plugins) { try { @@ -167,7 +167,7 @@ namespace OpenSim.Framework.Communications /// Agent profiles public UserAgentData GetUserAgent(LLUUID uuid) { - foreach (IUserData plugin in _plugins) + foreach (IUserDataPlugin plugin in _plugins) { try { @@ -189,7 +189,7 @@ namespace OpenSim.Framework.Communications /// A user agent public UserAgentData GetUserAgent(string name) { - foreach (IUserData plugin in _plugins) + foreach (IUserDataPlugin plugin in _plugins) { try { @@ -212,7 +212,7 @@ namespace OpenSim.Framework.Communications /// A user agent public UserAgentData GetUserAgent(string fname, string lname) { - foreach (IUserData plugin in _plugins) + foreach (IUserDataPlugin plugin in _plugins) { try { @@ -229,7 +229,7 @@ namespace OpenSim.Framework.Communications public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle) { - foreach (IUserData plugin in _plugins) + foreach (IUserDataPlugin plugin in _plugins) { try { @@ -249,7 +249,7 @@ namespace OpenSim.Framework.Communications /// A List of FriendListItems that contains info about the user's friends public List GetUserFriendList(LLUUID ownerID) { - foreach (IUserData plugin in _plugins) + foreach (IUserDataPlugin plugin in _plugins) { try { @@ -266,7 +266,7 @@ namespace OpenSim.Framework.Communications public void StoreWebLoginKey(LLUUID agentID, LLUUID webLoginKey) { - foreach (IUserData plugin in _plugins) + foreach (IUserDataPlugin plugin in _plugins) { try { @@ -281,7 +281,7 @@ namespace OpenSim.Framework.Communications public void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms) { - foreach (IUserData plugin in _plugins) + foreach (IUserDataPlugin plugin in _plugins) { try { @@ -296,7 +296,7 @@ namespace OpenSim.Framework.Communications public void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend) { - foreach (IUserData plugin in _plugins) + foreach (IUserDataPlugin plugin in _plugins) { try { @@ -311,7 +311,7 @@ namespace OpenSim.Framework.Communications public void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms) { - foreach (IUserData plugin in _plugins) + foreach (IUserDataPlugin plugin in _plugins) { try { @@ -545,7 +545,7 @@ namespace OpenSim.Framework.Communications user.HomeRegionX = regX; user.HomeRegionY = regY; - foreach (IUserData plugin in _plugins) + foreach (IUserDataPlugin plugin in _plugins) { try { @@ -567,7 +567,7 @@ namespace OpenSim.Framework.Communications m_log.Info("[USERSTORAGE]: Failed to find User by UUID " + UserProfile.ID.ToString()); return false; } - foreach (IUserData plugin in _plugins) + foreach (IUserDataPlugin plugin in _plugins) { try { @@ -593,7 +593,7 @@ namespace OpenSim.Framework.Communications /// The agent data to be added public bool AddUserAgent(UserAgentData agentdata) { - foreach (IUserData plugin in _plugins) + foreach (IUserDataPlugin plugin in _plugins) { try { @@ -612,7 +612,7 @@ namespace OpenSim.Framework.Communications /// TODO: stubs for now to get us to a compiling state gently public AvatarAppearance GetUserAppearance(LLUUID user) { - foreach (IUserData plugin in _plugins) + foreach (IUserDataPlugin plugin in _plugins) { try { @@ -628,7 +628,7 @@ namespace OpenSim.Framework.Communications public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) { - foreach (IUserData plugin in _plugins) + foreach (IUserDataPlugin plugin in _plugins) { try { @@ -643,7 +643,7 @@ namespace OpenSim.Framework.Communications public void AddAttachment(LLUUID user, LLUUID item) { - foreach (IUserData plugin in _plugins) + foreach (IUserDataPlugin plugin in _plugins) { try { @@ -658,7 +658,7 @@ namespace OpenSim.Framework.Communications public void RemoveAttachment(LLUUID user, LLUUID item) { - foreach (IUserData plugin in _plugins) + foreach (IUserDataPlugin plugin in _plugins) { try { @@ -673,7 +673,7 @@ namespace OpenSim.Framework.Communications public List GetAttachments(LLUUID user) { - foreach (IUserData plugin in _plugins) + foreach (IUserDataPlugin plugin in _plugins) { try { -- cgit v1.1