diff options
| author | Melanie | 2012-02-18 22:21:10 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-18 22:21:10 +0000 |
| commit | 985526b662f47404404281a3ef4a35afa607bfbf (patch) | |
| tree | cbda3c3003b6f456498f0ee3ec6edfc10b5fd64a /OpenSim/Services/Connectors | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-985526b662f47404404281a3ef4a35afa607bfbf.zip opensim-SC-985526b662f47404404281a3ef4a35afa607bfbf.tar.gz opensim-SC-985526b662f47404404281a3ef4a35afa607bfbf.tar.bz2 opensim-SC-985526b662f47404404281a3ef4a35afa607bfbf.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
Diffstat (limited to 'OpenSim/Services/Connectors')
| -rw-r--r-- | OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs index 44138c9..b1dd84e 100644 --- a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs +++ b/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs | |||
| @@ -220,7 +220,7 @@ namespace OpenSim.Services.Connectors.Friends | |||
| 220 | public bool Delete(Dictionary<string, object> sendData, string PrincipalID, string Friend) | 220 | public bool Delete(Dictionary<string, object> sendData, string PrincipalID, string Friend) |
| 221 | { | 221 | { |
| 222 | string reply = string.Empty; | 222 | string reply = string.Empty; |
| 223 | string uri = m_ServerURI = "/friends"; | 223 | string uri = m_ServerURI + "/friends"; |
| 224 | try | 224 | try |
| 225 | { | 225 | { |
| 226 | reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, ServerUtils.BuildQueryString(sendData)); | 226 | reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, ServerUtils.BuildQueryString(sendData)); |