OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

avinationmerge
Melanie Thielker 2010-09-08 00:50:31 +02:00
parent 7a1b1dd419 342c64b7ac
commit 319007783c
7 changed files with 140 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
View File

@ -81,7 +81,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
public SimianAssetServiceConnector(IConfigSource source)
{
Initialise(source);
CommonInit(source);
}
public void Initialise(IConfigSource source)
@ -91,6 +91,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
{
string name = moduleConfig.GetString("AssetServices", "");
if (name == Name)
CommonInit(source);
}
}
private void CommonInit(IConfigSource source)
{
IConfig gridConfig = source.Configs["AssetService"];
if (gridConfig != null)
@ -109,8 +114,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
else
m_Enabled = true;
}
}
}
#region IAssetService

9
OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
View File

@ -69,7 +69,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
public SimianAuthenticationServiceConnector(IConfigSource source)
{
Initialise(source);
CommonInit(source);
}
public void Initialise(IConfigSource source)
@ -79,6 +79,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
{
string name = moduleConfig.GetString("AuthenticationServices", "");
if (name == Name)
CommonInit(source);
}
}
private void CommonInit(IConfigSource source)
{
IConfig gridConfig = source.Configs["AuthenticationService"];
if (gridConfig != null)
@ -96,8 +101,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
if (String.IsNullOrEmpty(m_serverUrl))
m_log.Info("[SIMIAN AUTH CONNECTOR]: No AuthenticationServerURI specified, disabling connector");
}
}
}
public string Authenticate(UUID principalID, string password, int lifetime)
{

9
OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
View File

@ -74,7 +74,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
public SimianAvatarServiceConnector(IConfigSource source)
{
Initialise(source);
CommonInit(source);
}
public void Initialise(IConfigSource source)
@ -84,6 +84,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
{
string name = moduleConfig.GetString("AvatarServices", "");
if (name == Name)
CommonInit(source);
}
}
private void CommonInit(IConfigSource source)
{
IConfig gridConfig = source.Configs["AvatarService"];
if (gridConfig != null)
@ -101,8 +106,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
if (String.IsNullOrEmpty(m_serverUrl))
m_log.Info("[SIMIAN AVATAR CONNECTOR]: No AvatarServerURI specified, disabling connector");
}
}
}
#region IAvatarService

9
OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
View File

@ -98,7 +98,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
public SimianGridServiceConnector(IConfigSource source)
{
Initialise(source);
CommonInit(source);
}
public void Initialise(IConfigSource source)
@ -108,6 +108,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
{
string name = moduleConfig.GetString("GridServices", "");
if (name == Name)
CommonInit(source);
}
}
private void CommonInit(IConfigSource source)
{
IConfig gridConfig = source.Configs["GridService"];
if (gridConfig != null)
@ -125,8 +130,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
if (String.IsNullOrEmpty(m_serverUrl))
m_log.Info("[SIMIAN GRID CONNECTOR]: No GridServerURI specified, disabling connector");
}
}
}
#region IGridService

9
OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
View File

@ -88,7 +88,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
public SimianInventoryServiceConnector(IConfigSource source)
{
Initialise(source);
CommonInit(source);
}
public void Initialise(IConfigSource source)
@ -98,6 +98,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
{
string name = moduleConfig.GetString("InventoryServices", "");
if (name == Name)
CommonInit(source);
}
}
private void CommonInit(IConfigSource source)
{
IConfig gridConfig = source.Configs["InventoryService"];
if (gridConfig != null)
@ -127,8 +132,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
else if (String.IsNullOrEmpty(m_userServerUrl))
m_log.Info("[SIMIAN INVENTORY CONNECTOR]: No UserAccountServerURI specified, disabling connector");
}
}
}
/// <summary>
/// Create the entire inventory for a given user

9
OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
View File

@ -99,7 +99,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
public SimianPresenceServiceConnector(IConfigSource source)
{
Initialise(source);
CommonInit(source);
}
public void Initialise(IConfigSource source)
@ -109,6 +109,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
{
string name = moduleConfig.GetString("PresenceServices", "");
if (name == Name)
CommonInit(source);
}
}
private void CommonInit(IConfigSource source)
{
IConfig gridConfig = source.Configs["PresenceService"];
if (gridConfig != null)
@ -126,8 +131,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
if (String.IsNullOrEmpty(m_serverUrl))
m_log.Info("[SIMIAN PRESENCE CONNECTOR]: No PresenceServerURI specified, disabling connector");
}
}
}
#region IPresenceService

9
OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
View File

@ -73,7 +73,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
public SimianUserAccountServiceConnector(IConfigSource source)
{
Initialise(source);
CommonInit(source);
}
public void Initialise(IConfigSource source)
@ -83,6 +83,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
{
string name = moduleConfig.GetString("UserAccountServices", "");
if (name == Name)
CommonInit(source);
}
}
private void CommonInit(IConfigSource source)
{
IConfig gridConfig = source.Configs["UserAccountService"];
if (gridConfig != null)
@ -100,8 +105,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
if (String.IsNullOrEmpty(m_serverUrl))
m_log.Info("[SIMIAN ACCOUNT CONNECTOR]: No UserAccountServerURI specified, disabling connector");
}
}
}
public UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName)
{