diff options
author | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
---|---|---|
committer | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
commit | 159fcbf150b7da0e229b29aa7b94793484543d12 (patch) | |
tree | b8c0ff3b4c758a3fba8315b556c923ef4c02a185 /OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs | |
parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs index bd8069f..684a0db 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs | |||
@@ -392,7 +392,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
392 | { "UserID", client.AgentId.ToString() } | 392 | { "UserID", client.AgentId.ToString() } |
393 | }; | 393 | }; |
394 | 394 | ||
395 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 395 | OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
396 | string email = response["Email"].AsString(); | 396 | string email = response["Email"].AsString(); |
397 | 397 | ||
398 | if (!response["Success"].AsBoolean()) | 398 | if (!response["Success"].AsBoolean()) |
@@ -443,7 +443,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
443 | { key, OSDParser.SerializeJsonString(value) } | 443 | { key, OSDParser.SerializeJsonString(value) } |
444 | }; | 444 | }; |
445 | 445 | ||
446 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 446 | OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
447 | bool success = response["Success"].AsBoolean(); | 447 | bool success = response["Success"].AsBoolean(); |
448 | 448 | ||
449 | if (!success) | 449 | if (!success) |
@@ -462,7 +462,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
462 | { "UserID", userID.ToString() } | 462 | { "UserID", userID.ToString() } |
463 | }; | 463 | }; |
464 | 464 | ||
465 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 465 | OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
466 | if (response["Success"].AsBoolean() && response["User"] is OSDMap) | 466 | if (response["Success"].AsBoolean() && response["User"] is OSDMap) |
467 | { | 467 | { |
468 | return (OSDMap)response["User"]; | 468 | return (OSDMap)response["User"]; |