diff options
author | Justin Clarke Casey | 2009-04-22 18:15:43 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-04-22 18:15:43 +0000 |
commit | 2c81e41c8a884ece643f3079349b033d03b6b774 (patch) | |
tree | bea7956ef00378f47fa420e82ffb665a137a9630 /OpenSim/ApplicationPlugins | |
parent | From: Alan Webb <alan_webb@us.ibm.com> (diff) | |
download | opensim-SC_OLD-2c81e41c8a884ece643f3079349b033d03b6b774.zip opensim-SC_OLD-2c81e41c8a884ece643f3079349b033d03b6b774.tar.gz opensim-SC_OLD-2c81e41c8a884ece643f3079349b033d03b6b774.tar.bz2 opensim-SC_OLD-2c81e41c8a884ece643f3079349b033d03b6b774.tar.xz |
* Fission OGS1UserServices into user service and OGS1 user data plugin components
* Make OGS1UserServices inherit from UserManagerBase
* This allows grid mode regions to use the same user data plugin infrastructure as grid servers and standalone OpenSims
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r-- | OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs index a0c592e..cd39296 100644 --- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs +++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs | |||
@@ -220,7 +220,11 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager | |||
220 | new LocalUserServices( | 220 | new LocalUserServices( |
221 | m_openSim.NetServersInfo.DefaultHomeLocX, m_openSim.NetServersInfo.DefaultHomeLocY, inventoryService); | 221 | m_openSim.NetServersInfo.DefaultHomeLocX, m_openSim.NetServersInfo.DefaultHomeLocY, inventoryService); |
222 | localuserService.AddPlugin(m_openSim.ConfigurationSettings.StandaloneUserPlugin, m_openSim.ConfigurationSettings.StandaloneUserSource); | 222 | localuserService.AddPlugin(m_openSim.ConfigurationSettings.StandaloneUserPlugin, m_openSim.ConfigurationSettings.StandaloneUserSource); |
223 | |||
223 | HGUserServices userService = new HGUserServices(localuserService); | 224 | HGUserServices userService = new HGUserServices(localuserService); |
225 | // This plugin arrangement could eventually be configurable rather than hardcoded here. | ||
226 | OGS1UserDataPlugin userDataPlugin = new OGS1UserDataPlugin(m_commsManager); | ||
227 | userService.AddPlugin(userDataPlugin); | ||
224 | 228 | ||
225 | HGGridServicesStandalone gridService = new HGGridServicesStandalone(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_openSim.SceneManager); | 229 | HGGridServicesStandalone gridService = new HGGridServicesStandalone(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_openSim.SceneManager); |
226 | 230 | ||