diff options
author | Justin Clark-Casey (justincc) | 2010-09-03 22:27:01 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-09-03 22:27:01 +0100 |
commit | 9b95bd259fa15157947326f044f63aedc248e73c (patch) | |
tree | b89733673d71a41529b40ea55f2e66d712991ecb /OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs | |
parent | minor: remove mono compiler warning (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-9b95bd259fa15157947326f044f63aedc248e73c.zip opensim-SC_OLD-9b95bd259fa15157947326f044f63aedc248e73c.tar.gz opensim-SC_OLD-9b95bd259fa15157947326f044f63aedc248e73c.tar.bz2 opensim-SC_OLD-9b95bd259fa15157947326f044f63aedc248e73c.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs | 44 |
1 files changed, 18 insertions, 26 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs index 89c1a5a..63aaad7 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs | |||
@@ -92,38 +92,30 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
92 | 92 | ||
93 | public void Initialise(IConfigSource source) | 93 | public void Initialise(IConfigSource source) |
94 | { | 94 | { |
95 | if (Simian.IsSimianEnabled(source, "InventoryServices", this.Name)) | 95 | IConfig gridConfig = source.Configs["InventoryService"]; |
96 | if (gridConfig != null) | ||
96 | { | 97 | { |
97 | IConfig gridConfig = source.Configs["InventoryService"]; | ||
98 | if (gridConfig == null) | ||
99 | { | ||
100 | m_log.Error("[SIMIAN INVENTORY CONNECTOR]: InventoryService missing from OpenSim.ini"); | ||
101 | throw new Exception("Inventory connector init error"); | ||
102 | } | ||
103 | |||
104 | string serviceUrl = gridConfig.GetString("InventoryServerURI"); | 98 | string serviceUrl = gridConfig.GetString("InventoryServerURI"); |
105 | if (String.IsNullOrEmpty(serviceUrl)) | 99 | if (!String.IsNullOrEmpty(serviceUrl)) |
106 | { | 100 | { |
107 | m_log.Error("[SIMIAN INVENTORY CONNECTOR]: No Server URI named in section InventoryService"); | 101 | if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("=")) |
108 | throw new Exception("Inventory connector init error"); | 102 | serviceUrl = serviceUrl + '/'; |
109 | } | 103 | m_serverUrl = serviceUrl; |
110 | 104 | ||
111 | m_serverUrl = serviceUrl; | 105 | gridConfig = source.Configs["UserAccountService"]; |
112 | 106 | if (gridConfig != null) | |
113 | gridConfig = source.Configs["UserAccountService"]; | 107 | { |
114 | if (gridConfig != null) | 108 | serviceUrl = gridConfig.GetString("UserAccountServerURI"); |
115 | { | 109 | if (!String.IsNullOrEmpty(serviceUrl)) |
116 | serviceUrl = gridConfig.GetString("UserAccountServerURI"); | 110 | m_userServerUrl = serviceUrl; |
117 | if (!String.IsNullOrEmpty(serviceUrl)) | 111 | } |
118 | m_userServerUrl = serviceUrl; | ||
119 | else | ||
120 | m_log.Info("[SIMIAN INVENTORY CONNECTOR]: No Server URI named in section UserAccountService"); | ||
121 | } | ||
122 | else | ||
123 | { | ||
124 | m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: UserAccountService missing from OpenSim.ini"); | ||
125 | } | 112 | } |
126 | } | 113 | } |
114 | |||
115 | if (String.IsNullOrEmpty(m_serverUrl)) | ||
116 | m_log.Info("[SIMIAN INVENTORY CONNECTOR]: No InventoryServerURI specified, disabling connector"); | ||
117 | else if (String.IsNullOrEmpty(m_userServerUrl)) | ||
118 | m_log.Info("[SIMIAN INVENTORY CONNECTOR]: No UserAccountServerURI specified, disabling connector"); | ||
127 | } | 119 | } |
128 | 120 | ||
129 | /// <summary> | 121 | /// <summary> |