2 files changed, 46 insertions, 11 deletions

diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index aa68367..32bfed7 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -56,11 +56,11 @@ namespace OpenSim.Framework.Communications
         public void AddPlugin(string provider, string connect)
         {
             PluginLoader<IUserDataPlugin> loader =
-                new PluginLoader<IUserDataPlugin> (new UserDataInitialiser (connect));
+                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
-            loader.Add ("/OpenSim/UserData", new PluginProviderFilter (provider));
+            loader.Add("/OpenSim/UserData", new PluginProviderFilter(provider));            
             loader.Load();
 
             _plugins = loader.Plugins;
@@ -178,7 +178,12 @@ namespace OpenSim.Framework.Communications
             {
                 try
                 {
-                    return plugin.GetAgentByUUID(uuid);
+                    UserAgentData result = plugin.GetAgentByUUID(uuid);
+                  
+                    if (result != null) 
+                    {
+                        return result;
+                    }
                 }
                 catch (Exception e)
                 {
@@ -260,7 +265,12 @@ namespace OpenSim.Framework.Communications
             {
                 try
                 {
-                    return plugin.GetUserFriendList(ownerID);
+                    List<FriendListItem> result = plugin.GetUserFriendList(ownerID);
+                  
+                    if (result != null) 
+                    {
+                        return result;
+                    }
                 }
                 catch (Exception e)
                 {
@@ -331,7 +341,6 @@ namespace OpenSim.Framework.Communications
             }
         }
 
-
         /// <summary>
         /// Resets the currentAgent in the user profile
         /// </summary>
@@ -344,6 +353,7 @@ namespace OpenSim.Framework.Communications
             {
                 return;
             }
+            
             profile.CurrentAgent = null;
 
             UpdateUserProfile(profile);
diff --git a/OpenSim/Framework/PluginLoader.cs b/OpenSim/Framework/PluginLoader.cs
index ab4e217..a39f787 100644
--- a/OpenSim/Framework/PluginLoader.cs
+++ b/OpenSim/Framework/PluginLoader.cs
@@ -342,20 +342,45 @@ namespace OpenSim.Framework
     }
 
     /// <summary>
-    /// Filters out which plugin to load based on its "Provider", which is name given by in the addin.xml
+    /// Filters out which plugin to load based on its the plugin name or names given.  Plugin names are contained in 
+    /// their addin.xml
     /// </summary>
     public class PluginProviderFilter : IPluginFilter
     {
-        private string provider;
-
-        public PluginProviderFilter (string p)
+        private string[] m_filters;
+
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="p">
+        /// Plugin name or names on which to filter.  Multiple names should be separated by commas.
+        /// </param>
+        public PluginProviderFilter(string p)
         {
-            provider = p;
+            m_filters = p.Split(',');
+            
+            for (int i = 0; i < m_filters.Length; i++)
+            {
+                m_filters[i] = m_filters[i].Trim();
+            }
         }
 
+        /// <summary>
+        /// Apply this filter to the given plugin.
+        /// </summary>
+        /// <param name="plugin"></param>
+        /// <returns>true if the plugin's name matched one of the filters, false otherwise.</returns>
         public bool Apply (PluginExtensionNode plugin)
         {
-            return (plugin.Provider == provider);
+            for (int i = 0; i < m_filters.Length; i++) 
+            {
+                if (m_filters[i] == plugin.Provider) 
+                {
+                    return true;
+                }
+            }
+            
+            return false;
         }
     }
 }