aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMike Mazur2009-02-03 05:20:44 +0000
committerMike Mazur2009-02-03 05:20:44 +0000
commitd259238c748aafe366fd1d04e0248ef23116fd28 (patch)
treeec85d8863cffedda47d396d007459b5499bd8162 /OpenSim/Framework
parent- move OpenSim/Framework/IUserData.cs to OpenSim/Data/IUserData.cs (diff)
downloadopensim-SC_OLD-d259238c748aafe366fd1d04e0248ef23116fd28.zip
opensim-SC_OLD-d259238c748aafe366fd1d04e0248ef23116fd28.tar.gz
opensim-SC_OLD-d259238c748aafe366fd1d04e0248ef23116fd28.tar.bz2
opensim-SC_OLD-d259238c748aafe366fd1d04e0248ef23116fd28.tar.xz
- moved data plugin loading code from various places to
OpenSim/Data/DataPluginFactory.cs - removed dependencies on a few executable assemblies in bin/OpenSim.Data.addin.xml - trim trailing whitespace
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/InventoryServiceBase.cs20
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs21
2 files changed, 18 insertions, 23 deletions
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index ec5c493..a031bdf 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -59,20 +59,18 @@ namespace OpenSim.Framework.Communications
59 } 59 }
60 60
61 /// <summary> 61 /// <summary>
62 /// Adds a new inventory data plugin - plugins will be requested in the order they were loaded. 62 /// Adds a list of inventory data plugins, as described by `provider'
63 /// and `connect', to `m_plugins'.
63 /// </summary> 64 /// </summary>
64 /// <param name="provider">The filename of the inventory server plugin DLL</param> 65 /// <param name="provider">
66 /// The filename of the inventory server plugin DLL.
67 /// </param>
68 /// <param name="connect">
69 /// The connection string for the storage backend.
70 /// </param>
65 public void AddPlugin(string provider, string connect) 71 public void AddPlugin(string provider, string connect)
66 { 72 {
67 PluginLoader<IInventoryDataPlugin> loader = 73 m_plugins.AddRange(DataPluginFactory.LoadInventoryDataPlugins(provider, connect));
68 new PluginLoader<IInventoryDataPlugin> (new InventoryDataInitialiser(connect));
69
70 // loader will try to load all providers (MySQL, MSSQL, etc)
71 // unless it is constrainted to the correct "Provider" entry in the addin.xml
72 loader.Add ("/OpenSim/InventoryData", new PluginProviderFilter(provider));
73 loader.Load();
74
75 m_plugins.AddRange(loader.Plugins);
76 } 74 }
77 75
78 #endregion 76 #endregion
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index b12abb3..886900d 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -74,21 +74,18 @@ namespace OpenSim.Framework.Communications
74 } 74 }
75 75
76 /// <summary> 76 /// <summary>
77 /// Add a new user data plugin - plugins will be requested in the order they were added. 77 /// Adds a list of user data plugins, as described by `provider' and
78 /// `connect', to `_plugins'.
78 /// </summary> 79 /// </summary>
79 /// <param name="provider">The filename to the user data plugin DLL</param> 80 /// <param name="provider">
80 /// <param name="connect"></param> 81 /// The filename of the inventory server plugin DLL.
82 /// </param>
83 /// <param name="connect">
84 /// The connection string for the storage backend.
85 /// </param>
81 public void AddPlugin(string provider, string connect) 86 public void AddPlugin(string provider, string connect)
82 { 87 {
83 PluginLoader<IUserDataPlugin> loader = 88 _plugins.AddRange(DataPluginFactory.LoadUserDataPlugins(provider, connect));
84 new PluginLoader<IUserDataPlugin>(new UserDataInitialiser(connect));
85
86 // loader will try to load all providers (MySQL, MSSQL, etc)
87 // unless it is constrainted to the correct "Provider" entry in the addin.xml
88 loader.Add("/OpenSim/UserData", new PluginProviderFilter(provider));
89 loader.Load();
90
91 _plugins.AddRange(loader.Plugins);
92 } 89 }
93 90
94 #region Get UserProfile 91 #region Get UserProfile