ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 02:36:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Apply a modified version of http://opensimulator.org/mantis/view.php?id=2290

Browse Source 
* This allows multiple user profile providers to be specified in OpenSim.ini separated by commas
* If multiple providers are specified then a request for a user profile will query each in turn until the profile is either found or all have been queried
* Unfortunately I don't believe this order can currently be specified, which if true is something that will need to be fixed.
* Thanks to smeans for the original patch.
This commit is contained in:
Justin Clarke Casey
2008-10-17 16:44:05 +00:00
parent a6df2011f7
commit 138bcf6fff
5 changed files with 55 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Framework/Communications/UserManagerBase.cs
View File

@@ -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);

35
OpenSim/Framework/PluginLoader.cs
View File

@@ -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;
private string[] m_filters;
public PluginProviderFilter (string p)
/// <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;
}
}
}