diff options
| author | UbitUmarov | 2016-11-27 15:14:34 +0000 |
|---|---|---|
| committer | UbitUmarov | 2016-11-27 15:14:34 +0000 |
| commit | 877d3092b45723a2fe8b3a5bbc224cd5d5e55e82 (patch) | |
| tree | f11a5b2d85443fefc81e1958c82828a16fc656cc /OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs | |
| parent | fix pool parameters for httptests (diff) | |
| parent | HG on links request build the URI in http format with a / at end, this should... (diff) | |
| download | opensim-SC-877d3092b45723a2fe8b3a5bbc224cd5d5e55e82.zip opensim-SC-877d3092b45723a2fe8b3a5bbc224cd5d5e55e82.tar.gz opensim-SC-877d3092b45723a2fe8b3a5bbc224cd5d5e55e82.tar.bz2 opensim-SC-877d3092b45723a2fe8b3a5bbc224cd5d5e55e82.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs index 45f4514..74cd703 100644 --- a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs +++ b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs | |||
| @@ -158,7 +158,7 @@ namespace OpenSim.Services.Connectors.Friends | |||
| 158 | 158 | ||
| 159 | try | 159 | try |
| 160 | { | 160 | { |
| 161 | string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString); | 161 | string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString, 15, null, false); |
| 162 | if (reply != string.Empty) | 162 | if (reply != string.Empty) |
| 163 | { | 163 | { |
| 164 | Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); | 164 | Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); |