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/SimianPresenceServiceConnector.cs | |
parent | Avoid another null ref opportunity. (diff) | |
download | opensim-SC-64f2dc778ad7a080ba89a1077da538c011c7c934.zip opensim-SC-64f2dc778ad7a080ba89a1077da538c011c7c934.tar.gz opensim-SC-64f2dc778ad7a080ba89a1077da538c011c7c934.tar.bz2 opensim-SC-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/SimianPresenceServiceConnector.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs index 01163aa..211b775 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs | |||
@@ -149,7 +149,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
149 | requestArgs["SecureSessionID"] = secureSessionID.ToString(); | 149 | requestArgs["SecureSessionID"] = secureSessionID.ToString(); |
150 | } | 150 | } |
151 | 151 | ||
152 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 152 | OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
153 | bool success = response["Success"].AsBoolean(); | 153 | bool success = response["Success"].AsBoolean(); |
154 | 154 | ||
155 | if (!success) | 155 | if (!success) |
@@ -168,7 +168,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
168 | { "SessionID", sessionID.ToString() } | 168 | { "SessionID", sessionID.ToString() } |
169 | }; | 169 | }; |
170 | 170 | ||
171 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 171 | OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
172 | bool success = response["Success"].AsBoolean(); | 172 | bool success = response["Success"].AsBoolean(); |
173 | 173 | ||
174 | if (!success) | 174 | if (!success) |
@@ -187,7 +187,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
187 | { "SceneID", regionID.ToString() } | 187 | { "SceneID", regionID.ToString() } |
188 | }; | 188 | }; |
189 | 189 | ||
190 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 190 | OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
191 | bool success = response["Success"].AsBoolean(); | 191 | bool success = response["Success"].AsBoolean(); |
192 | 192 | ||
193 | if (!success) | 193 | if (!success) |
@@ -232,7 +232,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
232 | { "UserIDList", String.Join(",",userIDs) } | 232 | { "UserIDList", String.Join(",",userIDs) } |
233 | }; | 233 | }; |
234 | 234 | ||
235 | OSDMap sessionListResponse = WebUtil.PostToService(m_serverUrl, requestArgs); | 235 | OSDMap sessionListResponse = SimianGrid.PostToService(m_serverUrl, requestArgs); |
236 | if (! sessionListResponse["Success"].AsBoolean()) | 236 | if (! sessionListResponse["Success"].AsBoolean()) |
237 | { | 237 | { |
238 | m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve sessions: {0}",sessionListResponse["Message"].AsString()); | 238 | m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve sessions: {0}",sessionListResponse["Message"].AsString()); |
@@ -275,7 +275,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
275 | { "LastLocation", SerializeLocation(regionID, lastPosition, lastLookAt) } | 275 | { "LastLocation", SerializeLocation(regionID, lastPosition, lastLookAt) } |
276 | }; | 276 | }; |
277 | 277 | ||
278 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 278 | OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
279 | bool success = response["Success"].AsBoolean(); | 279 | bool success = response["Success"].AsBoolean(); |
280 | 280 | ||
281 | if (!success) | 281 | if (!success) |
@@ -295,7 +295,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
295 | { "HomeLocation", SerializeLocation(regionID, position, lookAt) } | 295 | { "HomeLocation", SerializeLocation(regionID, position, lookAt) } |
296 | }; | 296 | }; |
297 | 297 | ||
298 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 298 | OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
299 | bool success = response["Success"].AsBoolean(); | 299 | bool success = response["Success"].AsBoolean(); |
300 | 300 | ||
301 | if (!success) | 301 | if (!success) |
@@ -340,7 +340,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
340 | { "UserID", userID.ToString() } | 340 | { "UserID", userID.ToString() } |
341 | }; | 341 | }; |
342 | 342 | ||
343 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 343 | OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
344 | if (response["Success"].AsBoolean() && response["User"] is OSDMap) | 344 | if (response["Success"].AsBoolean() && response["User"] is OSDMap) |
345 | return response; | 345 | return response; |
346 | 346 | ||
@@ -356,7 +356,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
356 | { "SessionID", sessionID.ToString() } | 356 | { "SessionID", sessionID.ToString() } |
357 | }; | 357 | }; |
358 | 358 | ||
359 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 359 | OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
360 | if (response["Success"].AsBoolean()) | 360 | if (response["Success"].AsBoolean()) |
361 | return response; | 361 | return response; |
362 | 362 | ||
@@ -376,7 +376,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
376 | { "SceneLookAt", lastLookAt.ToString() } | 376 | { "SceneLookAt", lastLookAt.ToString() } |
377 | }; | 377 | }; |
378 | 378 | ||
379 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 379 | OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
380 | bool success = response["Success"].AsBoolean(); | 380 | bool success = response["Success"].AsBoolean(); |
381 | 381 | ||
382 | if (!success) | 382 | if (!success) |