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/SimianFriendsServiceConnector.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/SimianFriendsServiceConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs index 7422d94..9a8164c 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs | |||
@@ -153,7 +153,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
153 | { "Value", flags.ToString() } | 153 | { "Value", flags.ToString() } |
154 | }; | 154 | }; |
155 | 155 | ||
156 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 156 | OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
157 | bool success = response["Success"].AsBoolean(); | 157 | bool success = response["Success"].AsBoolean(); |
158 | 158 | ||
159 | if (!success) | 159 | if (!success) |
@@ -180,7 +180,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
180 | { "Key", friend } | 180 | { "Key", friend } |
181 | }; | 181 | }; |
182 | 182 | ||
183 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 183 | OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
184 | bool success = response["Success"].AsBoolean(); | 184 | bool success = response["Success"].AsBoolean(); |
185 | 185 | ||
186 | if (!success) | 186 | if (!success) |
@@ -200,7 +200,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
200 | { "Type", "Friend" } | 200 | { "Type", "Friend" } |
201 | }; | 201 | }; |
202 | 202 | ||
203 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 203 | OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
204 | if (response["Success"].AsBoolean() && response["Entries"] is OSDArray) | 204 | if (response["Success"].AsBoolean() && response["Entries"] is OSDArray) |
205 | { | 205 | { |
206 | return (OSDArray)response["Entries"]; | 206 | return (OSDArray)response["Entries"]; |
@@ -221,7 +221,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
221 | { "Type", "Friend" } | 221 | { "Type", "Friend" } |
222 | }; | 222 | }; |
223 | 223 | ||
224 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 224 | OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
225 | if (response["Success"].AsBoolean() && response["Entries"] is OSDArray) | 225 | if (response["Success"].AsBoolean() && response["Entries"] is OSDArray) |
226 | { | 226 | { |
227 | return (OSDArray)response["Entries"]; | 227 | return (OSDArray)response["Entries"]; |