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/SimianAvatarServiceConnector.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/SimianAvatarServiceConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs index 841bfa0..a397740 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs | |||
@@ -122,7 +122,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
122 | { "UserID", userID.ToString() } | 122 | { "UserID", userID.ToString() } |
123 | }; | 123 | }; |
124 | 124 | ||
125 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 125 | OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
126 | if (response["Success"].AsBoolean()) | 126 | if (response["Success"].AsBoolean()) |
127 | { | 127 | { |
128 | OSDMap map = null; | 128 | OSDMap map = null; |
@@ -168,7 +168,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
168 | { "LLPackedAppearance", OSDParser.SerializeJsonString(map) } | 168 | { "LLPackedAppearance", OSDParser.SerializeJsonString(map) } |
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) |
@@ -189,7 +189,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
189 | { "UserID", userID.ToString() } | 189 | { "UserID", userID.ToString() } |
190 | }; | 190 | }; |
191 | 191 | ||
192 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 192 | OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
193 | if (response["Success"].AsBoolean()) | 193 | if (response["Success"].AsBoolean()) |
194 | { | 194 | { |
195 | OSDMap map = null; | 195 | OSDMap map = null; |
@@ -306,7 +306,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
306 | { "LLAttachments", OSDParser.SerializeJsonString(items) } | 306 | { "LLAttachments", OSDParser.SerializeJsonString(items) } |
307 | }; | 307 | }; |
308 | 308 | ||
309 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 309 | OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
310 | bool success = response["Success"].AsBoolean(); | 310 | bool success = response["Success"].AsBoolean(); |
311 | 311 | ||
312 | if (!success) | 312 | if (!success) |