Apply updated patch from issue 1871. Thanks sempuki.

8 files changed, 35 insertions, 34 deletions

diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs
index 0703aab..e832414 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs
@@ -416,7 +416,7 @@ namespace OpenSim.Data.MSSQL
         }
 
         /// <summary>
-        /// See IUserData
+        /// See IUserDataPlugin
         /// </summary>
         /// <param name="uuid"></param>
         /// <returns></returns>
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index d8830de..131823a 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -244,7 +244,7 @@ namespace OpenSim.Data.MySQL
 
         #endregion
 
-        // see IUserData
+        // see IUserDataPlugin
         override public UserProfileData GetUserByName(string user, string last)
         {
             try
@@ -508,7 +508,7 @@ namespace OpenSim.Data.MySQL
         }
 
         /// <summary>
-        /// See IUserData
+        /// See IUserDataPlugin
         /// </summary>
         /// <param name="uuid">User UUID</param>
         /// <returns>User profile data</returns>
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index 2d3687c..45b4dc6 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -133,7 +133,7 @@ namespace OpenSim.Data.SQLite
         public override void Dispose () {} 
 
         /// <summary>
-        /// see IUserData, 
+        /// see IUserDataPlugin,
         /// Get user data profile by UUID
         /// </summary>
         /// <param name="uuid">User UUID</param>
@@ -161,7 +161,7 @@ namespace OpenSim.Data.SQLite
         }
 
         /// <summary>
-        /// see IUserData, 
+        /// see IUserDataPlugin,
         /// Get user data profile by name
         /// </summary>
         /// <param name="fname">first name</param>
diff --git a/OpenSim/Data/UserDataBase.cs b/OpenSim/Data/UserDataBase.cs
index e4e39d6..e604bfd 100644
--- a/OpenSim/Data/UserDataBase.cs
+++ b/OpenSim/Data/UserDataBase.cs
@@ -33,7 +33,7 @@ using OpenSim.Framework;
 
 namespace OpenSim.Data
 {
-    public abstract class UserDataBase : IUserData
+    public abstract class UserDataBase : IUserDataPlugin
     {
         // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
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<IUserData> _plugins = new List<IUserData>();
+        private List<IUserDataPlugin> _plugins = new List<IUserDataPlugin>();
 
         /// <summary>
         /// 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
         /// <param name="provider">The filename to the user server plugin DLL</param>
         public void AddPlugin(string provider, string connect)
         {
-            PluginLoader<IUserData> loader = 
-                new PluginLoader<IUserData> (new UserDataInitialiser (connect));
+            PluginLoader<IUserDataPlugin> loader =
+                new PluginLoader<IUserDataPlugin> (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<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(LLUUID queryID, string query)
         {
             List<AvatarPickerAvatar> pickerlist = new List<AvatarPickerAvatar>();
-            foreach (IUserData plugin in _plugins)
+            foreach (IUserDataPlugin plugin in _plugins)
             {
                 try
                 {
@@ -140,7 +140,7 @@ namespace OpenSim.Framework.Communications
         /// <returns></returns>
         public bool UpdateUserProfile(UserProfileData data)
         {
-            foreach (IUserData plugin in _plugins)
+            foreach (IUserDataPlugin plugin in _plugins)
             {
                 try
                 {
@@ -167,7 +167,7 @@ namespace OpenSim.Framework.Communications
         /// <returns>Agent profiles</returns>
         public UserAgentData GetUserAgent(LLUUID uuid)
         {
-            foreach (IUserData plugin in _plugins)
+            foreach (IUserDataPlugin plugin in _plugins)
             {
                 try
                 {
@@ -189,7 +189,7 @@ namespace OpenSim.Framework.Communications
         /// <returns>A user agent</returns>
         public UserAgentData GetUserAgent(string name)
         {
-            foreach (IUserData plugin in _plugins)
+            foreach (IUserDataPlugin plugin in _plugins)
             {
                 try
                 {
@@ -212,7 +212,7 @@ namespace OpenSim.Framework.Communications
         /// <returns>A user agent</returns>
         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
         /// <returns>A List of FriendListItems that contains info about the user's friends</returns>
         public List<FriendListItem> 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
         /// <param name="agentdata">The agent data to be added</param>
         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<LLUUID> GetAttachments(LLUUID user)
         {
-            foreach (IUserData plugin in _plugins)
+            foreach (IUserDataPlugin plugin in _plugins)
             {
                 try
                 {
diff --git a/OpenSim/Framework/IUserData.cs b/OpenSim/Framework/IUserData.cs
index 27686c0..5ecb482 100644
--- a/OpenSim/Framework/IUserData.cs
+++ b/OpenSim/Framework/IUserData.cs
@@ -33,7 +33,7 @@ namespace OpenSim.Framework
     /// <summary>
     /// An interface for connecting to user storage servers.
     /// </summary>
-    public interface IUserData : IPlugin
+    public interface IUserDataPlugin : IPlugin
     {
         /// <summary>
         /// Returns a user profile from a database via their UUID
@@ -177,7 +177,7 @@ namespace OpenSim.Framework
         public UserDataInitialiser (string s) { connect = s; }
         public override void Initialise (IPlugin plugin)
         {
-            IUserData p = plugin as IUserData;
+            IUserDataPlugin p = plugin as IUserDataPlugin;
             p.Initialise (connect);
         }
     }
diff --git a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
index 625e3c5..0d50f0e 100644
--- a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
+++ b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
@@ -52,6 +52,7 @@ using OpenSim.Region.Environment.Scenes;
 namespace OpenSim.ApplicationPlugins.LoadBalancer
 {
     [Extension("/OpenSim/Startup")]
+    [ExtensionNode ("Plugin")]
     public class LoadBalancerPlugin : IApplicationPlugin
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/bin/OpenSim.Data.addin.xml b/bin/OpenSim.Data.addin.xml
index 9530c16..c3d016b 100644
--- a/bin/OpenSim.Data.addin.xml
+++ b/bin/OpenSim.Data.addin.xml
@@ -20,6 +20,6 @@
         <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Framework.IInventoryDataPlugin"/>
     </ExtensionPoint>
     <ExtensionPoint path = "/OpenSim/UserData">
-        <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Framework.IUserData"/>
+        <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Framework.IUserDataPlugin"/>
     </ExtensionPoint>
 </Addin>