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

Committing RemoteUserServiceConnector out connector, local user service

Browse Source 
connector and the glue code.
This commit is contained in:
Melanie Thielker
2009-06-22 13:14:48 +00:00
parent 044446821b
commit 77ebb7c9f3
4 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs
View File

@@ -42,7 +42,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
LogManager.GetLogger(
MethodBase.GetCurrentMethod().DeclaringType);
private IUserService m_UserService;
private IUserDataService m_UserService;
private bool m_Enabled = false;
@@ -77,7 +77,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
Object[] args = new Object[] { source };
m_UserService =
ServerUtils.LoadPlugin<IUserService>(serviceDll,
ServerUtils.LoadPlugin<IUserDataService>(serviceDll,
args);
if (m_UserService == null)
@@ -108,7 +108,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
if (!m_Enabled)
return;
scene.RegisterModuleInterface<IUserService>(m_UserService);
scene.RegisterModuleInterface<IUserDataService>(m_UserService);
}
public void RemoveRegion(Scene scene)

25
OpenSim/Region/CoreModules/ServiceConnectorsOut/User/RemoteUserServiceConnector.cs
View File

@@ -26,14 +26,22 @@
*/
using Nini.Config;
using log4net;
using System.Reflection;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Services.Interfaces;
using OpenSim.Services.Connectors;
namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
{
public class RemoteUserServicesConnector : ISharedRegionModule
public class RemoteUserServicesConnector : UserServicesConnector,
ISharedRegionModule, IUserDataService
{
private static readonly ILog m_log =
LogManager.GetLogger(
MethodBase.GetCurrentMethod().DeclaringType);
private bool m_Enabled = false;
public string Name
@@ -41,7 +49,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
get { return "RemoteUserServicesConnector"; }
}
public void Initialise(IConfigSource source)
public override void Initialise(IConfigSource source)
{
IConfig moduleConfig = source.Configs["Modules"];
if (moduleConfig != null)
@@ -49,7 +57,18 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
string name = moduleConfig.GetString("UserServices", "");
if (name == Name)
{
IConfig userConfig = source.Configs["UserService"];
if (userConfig == null)
{
m_log.Error("[USER CONNECTOR]: UserService missing from OpanSim.ini");
return;
}
m_Enabled = true;
base.Initialise(source);
m_log.Info("[USER CONNECTOR]: Remote users enabled");
}
}
}
@@ -70,6 +89,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
{
if (!m_Enabled)
return;
scene.RegisterModuleInterface<IUserDataService>(this);
}
public void RemoveRegion(Scene scene)