diff options
author | Mic Bowman | 2013-07-31 11:27:35 -0700 |
---|---|---|
committer | Mic Bowman | 2013-07-31 11:27:35 -0700 |
commit | 64f2dc778ad7a080ba89a1077da538c011c7c934 (patch) | |
tree | 963b456d229b7b986b8f8a6ce251e52774de474d /OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs | |
parent | Avoid another null ref opportunity. (diff) | |
download | opensim-SC_OLD-64f2dc778ad7a080ba89a1077da538c011c7c934.zip opensim-SC_OLD-64f2dc778ad7a080ba89a1077da538c011c7c934.tar.gz opensim-SC_OLD-64f2dc778ad7a080ba89a1077da538c011c7c934.tar.bz2 opensim-SC_OLD-64f2dc778ad7a080ba89a1077da538c011c7c934.tar.xz |
A pretty major restructuring of the simian method invocations in order to
service access capabilities. In conjunction with the corresponding Simian
updates, this enables explicit per-simulator capability-based access to
grid services. That enables grid owners to add or revoke access to the grid
on a simulator by simulator basis.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs index 6e32b3a..7e36c69 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs | |||
@@ -165,7 +165,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
165 | { "NameQuery", query } | 165 | { "NameQuery", query } |
166 | }; | 166 | }; |
167 | 167 | ||
168 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 168 | OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
169 | if (response["Success"].AsBoolean()) | 169 | if (response["Success"].AsBoolean()) |
170 | { | 170 | { |
171 | OSDArray array = response["Users"] as OSDArray; | 171 | OSDArray array = response["Users"] as OSDArray; |
@@ -204,7 +204,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
204 | { "AccessLevel", data.UserLevel.ToString() } | 204 | { "AccessLevel", data.UserLevel.ToString() } |
205 | }; | 205 | }; |
206 | 206 | ||
207 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 207 | OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
208 | 208 | ||
209 | if (response["Success"].AsBoolean()) | 209 | if (response["Success"].AsBoolean()) |
210 | { | 210 | { |
@@ -219,7 +219,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
219 | { "UserTitle", data.UserTitle } | 219 | { "UserTitle", data.UserTitle } |
220 | }; | 220 | }; |
221 | 221 | ||
222 | response = WebUtil.PostToService(m_serverUrl, requestArgs); | 222 | response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
223 | bool success = response["Success"].AsBoolean(); | 223 | bool success = response["Success"].AsBoolean(); |
224 | 224 | ||
225 | if (success) | 225 | if (success) |
@@ -252,7 +252,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
252 | string lookupValue = (requestArgs.Count > 1) ? requestArgs[1] : "(Unknown)"; | 252 | string lookupValue = (requestArgs.Count > 1) ? requestArgs[1] : "(Unknown)"; |
253 | // m_log.DebugFormat("[SIMIAN ACCOUNT CONNECTOR]: Looking up user account with query: " + lookupValue); | 253 | // m_log.DebugFormat("[SIMIAN ACCOUNT CONNECTOR]: Looking up user account with query: " + lookupValue); |
254 | 254 | ||
255 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 255 | OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
256 | if (response["Success"].AsBoolean()) | 256 | if (response["Success"].AsBoolean()) |
257 | { | 257 | { |
258 | OSDMap user = response["User"] as OSDMap; | 258 | OSDMap user = response["User"] as OSDMap; |