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/SimianInventoryServiceConnector.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 'OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs | 41 |
1 files changed, 28 insertions, 13 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs index a41e493..891782f 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs | |||
@@ -92,23 +92,38 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
92 | 92 | ||
93 | public void Initialise(IConfigSource source) | 93 | public void Initialise(IConfigSource source) |
94 | { | 94 | { |
95 | IConfig gridConfig = source.Configs["InventoryService"]; | 95 | if (Simian.IsSimianEnabled(source, "InventoryServices")) |
96 | if (gridConfig == null) | ||
97 | { | 96 | { |
98 | m_log.Error("[INVENTORY CONNECTOR]: InventoryService missing from OpenSim.ini"); | 97 | IConfig gridConfig = source.Configs["InventoryService"]; |
99 | throw new Exception("Inventory connector init error"); | 98 | if (gridConfig == null) |
100 | } | 99 | { |
100 | m_log.Error("[INVENTORY CONNECTOR]: InventoryService missing from OpenSim.ini"); | ||
101 | throw new Exception("Inventory connector init error"); | ||
102 | } | ||
101 | 103 | ||
102 | string serviceUrl = gridConfig.GetString("InventoryServerURI"); | 104 | string serviceUrl = gridConfig.GetString("InventoryServerURI"); |
103 | if (String.IsNullOrEmpty(serviceUrl)) | 105 | if (String.IsNullOrEmpty(serviceUrl)) |
104 | { | 106 | { |
105 | m_log.Info("[INVENTORY CONNECTOR]: No Server URI named in section InventoryService, skipping SimianInventoryServiceConnector"); | 107 | m_log.Error("[INVENTORY CONNECTOR]: No Server URI named in section InventoryService"); |
106 | return; | 108 | throw new Exception("Inventory connector init error"); |
107 | } | 109 | } |
108 | 110 | ||
109 | // FIXME: Get the user server URL too | 111 | m_serverUrl = serviceUrl; |
110 | 112 | ||
111 | m_serverUrl = serviceUrl; | 113 | gridConfig = source.Configs["UserAccountService"]; |
114 | if (gridConfig != null) | ||
115 | { | ||
116 | serviceUrl = gridConfig.GetString("UserAccountServerURI"); | ||
117 | if (!String.IsNullOrEmpty(serviceUrl)) | ||
118 | m_userServerUrl = serviceUrl; | ||
119 | else | ||
120 | m_log.Info("[INVENTORY CONNECTOR]: No Server URI named in section UserAccountService"); | ||
121 | } | ||
122 | else | ||
123 | { | ||
124 | m_log.Warn("[INVENTORY CONNECTOR]: UserAccountService missing from OpenSim.ini"); | ||
125 | } | ||
126 | } | ||
112 | } | 127 | } |
113 | 128 | ||
114 | /// <summary> | 129 | /// <summary> |