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/SimianAuthenticationServiceConnector.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/SimianAuthenticationServiceConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs index 03b19ae..c402907 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs | |||
@@ -116,7 +116,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
116 | { "UserID", principalID.ToString() } | 116 | { "UserID", principalID.ToString() } |
117 | }; | 117 | }; |
118 | 118 | ||
119 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 119 | OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
120 | if (response["Success"].AsBoolean() && response["Identities"] is OSDArray) | 120 | if (response["Success"].AsBoolean() && response["Identities"] is OSDArray) |
121 | { | 121 | { |
122 | bool md5hashFound = false; | 122 | bool md5hashFound = false; |
@@ -159,7 +159,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
159 | { "SessionID", token } | 159 | { "SessionID", token } |
160 | }; | 160 | }; |
161 | 161 | ||
162 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 162 | OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
163 | if (response["Success"].AsBoolean()) | 163 | if (response["Success"].AsBoolean()) |
164 | { | 164 | { |
165 | return true; | 165 | return true; |
@@ -181,7 +181,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
181 | { "UserID", principalID.ToString() } | 181 | { "UserID", principalID.ToString() } |
182 | }; | 182 | }; |
183 | 183 | ||
184 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 184 | OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
185 | if (response["Success"].AsBoolean()) | 185 | if (response["Success"].AsBoolean()) |
186 | { | 186 | { |
187 | return true; | 187 | return true; |
@@ -204,7 +204,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
204 | { "UserID", principalID.ToString() } | 204 | { "UserID", principalID.ToString() } |
205 | }; | 205 | }; |
206 | 206 | ||
207 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 207 | OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
208 | if (response["Success"].AsBoolean() && response["User"] is OSDMap) | 208 | if (response["Success"].AsBoolean() && response["User"] is OSDMap) |
209 | { | 209 | { |
210 | OSDMap userMap = (OSDMap)response["User"]; | 210 | OSDMap userMap = (OSDMap)response["User"]; |
@@ -224,7 +224,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
224 | { "UserID", principalID.ToString() } | 224 | { "UserID", principalID.ToString() } |
225 | }; | 225 | }; |
226 | 226 | ||
227 | response = WebUtil.PostToService(m_serverUrl, requestArgs); | 227 | response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
228 | bool success = response["Success"].AsBoolean(); | 228 | bool success = response["Success"].AsBoolean(); |
229 | 229 | ||
230 | if (!success) | 230 | if (!success) |
@@ -303,7 +303,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
303 | { "UserID", userID.ToString() } | 303 | { "UserID", userID.ToString() } |
304 | }; | 304 | }; |
305 | 305 | ||
306 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 306 | OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
307 | if (response["Success"].AsBoolean()) | 307 | if (response["Success"].AsBoolean()) |
308 | return response["SessionID"].AsUUID().ToString(); | 308 | return response["SessionID"].AsUUID().ToString(); |
309 | else | 309 | else |