diff options
author | John Hurliman | 2010-03-12 14:28:31 -0800 |
---|---|---|
committer | John Hurliman | 2010-03-12 14:28:31 -0800 |
commit | 3036aba875187923b4e4d8481d46334e53393107 (patch) | |
tree | 4aa2b5ba3687873e0be69cee84a0652c9f2dd136 /OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs | |
parent | Fixing the previous patch to work correctly with standalone mode (diff) | |
download | opensim-SC_OLD-3036aba875187923b4e4d8481d46334e53393107.zip opensim-SC_OLD-3036aba875187923b4e4d8481d46334e53393107.tar.gz opensim-SC_OLD-3036aba875187923b4e4d8481d46334e53393107.tar.bz2 opensim-SC_OLD-3036aba875187923b4e4d8481d46334e53393107.tar.xz |
* 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
* Applying #4602 from Misterblu to add collision detection to BulletDotNET
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs index 3a35d9a..bb0ac57 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs | |||
@@ -77,22 +77,25 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
77 | 77 | ||
78 | public void Initialise(IConfigSource source) | 78 | public void Initialise(IConfigSource source) |
79 | { | 79 | { |
80 | IConfig assetConfig = source.Configs["UserAccountService"]; | 80 | if (Simian.IsSimianEnabled(source, "UserAccountServices")) |
81 | if (assetConfig == null) | ||
82 | { | 81 | { |
83 | m_log.Error("[ACCOUNT CONNECTOR]: UserAccountService missing from OpenSim.ini"); | 82 | IConfig assetConfig = source.Configs["UserAccountService"]; |
84 | throw new Exception("User account connector init error"); | 83 | if (assetConfig == null) |
85 | } | 84 | { |
85 | m_log.Error("[ACCOUNT CONNECTOR]: UserAccountService missing from OpenSim.ini"); | ||
86 | throw new Exception("User account connector init error"); | ||
87 | } | ||
86 | 88 | ||
87 | string serviceURI = assetConfig.GetString("UserAccountServerURI"); | 89 | string serviceURI = assetConfig.GetString("UserAccountServerURI"); |
88 | if (String.IsNullOrEmpty(serviceURI)) | 90 | if (String.IsNullOrEmpty(serviceURI)) |
89 | { | 91 | { |
90 | m_log.Info("[ACCOUNT CONNECTOR]: No UserAccountServerURI in section UserAccountService, skipping SimianUserAccountServiceConnector"); | 92 | m_log.Error("[ACCOUNT CONNECTOR]: No UserAccountServerURI in section UserAccountService, skipping SimianUserAccountServiceConnector"); |
91 | return; | 93 | throw new Exception("User account connector init error"); |
92 | } | 94 | } |
93 | 95 | ||
94 | m_accountCache = new ExpiringCache<UUID, UserAccount>(); | 96 | m_accountCache = new ExpiringCache<UUID, UserAccount>(); |
95 | m_serverUrl = serviceURI; | 97 | m_serverUrl = serviceURI; |
98 | } | ||
96 | } | 99 | } |
97 | 100 | ||
98 | public UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName) | 101 | public UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName) |