ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 20:55:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Added a better check to the SimianGrid connectors to test if they are enabled or not. This method should work equally well with standalone or robust mode

Browse Source 
* Applying #4602 from Misterblu to add collision detection to BulletDotNET
This commit is contained in:
John Hurliman
2010-03-12 14:28:31 -08:00
parent 9e3cdc4da5
commit 3036aba875
18 changed files with 6198 additions and 5998 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,21 +73,24 @@ namespace OpenSim.Services.Connectors.SimianGrid
public void Initialise(IConfigSource source)
{
IConfig assetConfig = source.Configs["AuthenticationService"];
if (assetConfig == null)
if (Simian.IsSimianEnabled(source, "AuthenticationServices"))
{
m_log.Error("[AUTH CONNECTOR]: AuthenticationService missing from OpenSim.ini");
throw new Exception("Authentication connector init error");
}
IConfig assetConfig = source.Configs["AuthenticationService"];
if (assetConfig == null)
{
m_log.Error("[AUTH CONNECTOR]: AuthenticationService missing from OpenSim.ini");
throw new Exception("Authentication connector init error");
}
string serviceURI = assetConfig.GetString("AuthenticationServerURI");
if (String.IsNullOrEmpty(serviceURI))
{
m_log.Info("[AUTH CONNECTOR]: No Server URI named in section AuthenticationService, skipping SimianAuthenticationServiceConnector");
return;
}
string serviceURI = assetConfig.GetString("AuthenticationServerURI");
if (String.IsNullOrEmpty(serviceURI))
{
m_log.Error("[AUTH CONNECTOR]: No Server URI named in section AuthenticationService");
throw new Exception("Authentication connector init error");
}
m_serverUrl = serviceURI;
m_serverUrl = serviceURI;
}
}
public string Authenticate(UUID principalID, string password, int lifetime)