Merge branch 'master' into careminster-presence-refactor

author: Melanie 2010-06-04 21:11:15 +0100
committer: Melanie 2010-06-04 21:11:15 +0100
commit: c5878b6610d4a729752fddf15ad6c99c302375a3 (patch)
tree: 12c570c68ed6f49965ce42fa0147b79ca21d9f96 /OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
parent: Change the admin kick message to something more generic, "OpenSim Manager" is... (diff)
parent: bring TestLoadIarV0_1AbsentUsers() back online (diff)
download: opensim-SC-c5878b6610d4a729752fddf15ad6c99c302375a3.zip
opensim-SC-c5878b6610d4a729752fddf15ad6c99c302375a3.tar.gz
opensim-SC-c5878b6610d4a729752fddf15ad6c99c302375a3.tar.bz2
opensim-SC-c5878b6610d4a729752fddf15ad6c99c302375a3.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
index baefebd..d7a5731 100644
--- a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
@@ -196,7 +196,7 @@ namespace OpenSim.Services.Connectors
        {
            Dictionary<string, object> sendData = new Dictionary<string, object>();
            sendData["PRINCIPALID"] = PrincipalID.ToString();
-            sendData["FRIENDS"] = Friend;
+            sendData["FRIEND"] = Friend;
            sendData["METHOD"] = "deletefriend";
            string reqString = ServerUtils.BuildQueryString(sendData);
author	Melanie	2010-06-04 21:11:15 +0100
committer	Melanie	2010-06-04 21:11:15 +0100
commit	c5878b6610d4a729752fddf15ad6c99c302375a3 (patch)
tree	12c570c68ed6f49965ce42fa0147b79ca21d9f96 /OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
parent	Change the admin kick message to something more generic, "OpenSim Manager" is... (diff)
parent	bring TestLoadIarV0_1AbsentUsers() back online (diff)
download	opensim-SC-c5878b6610d4a729752fddf15ad6c99c302375a3.zip opensim-SC-c5878b6610d4a729752fddf15ad6c99c302375a3.tar.gz opensim-SC-c5878b6610d4a729752fddf15ad6c99c302375a3.tar.bz2 opensim-SC-c5878b6610d4a729752fddf15ad6c99c302375a3.tar.xz

diff --git a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs index baefebd..d7a5731 100644 --- a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs +++ b/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
@@ -196,7 +196,7 @@ namespace OpenSim.Services.Connectors
196	{	196	{
197	Dictionary<string, object> sendData = new Dictionary<string, object>();	197	Dictionary<string, object> sendData = new Dictionary<string, object>();
198	sendData["PRINCIPALID"] = PrincipalID.ToString();	198	sendData["PRINCIPALID"] = PrincipalID.ToString();
199	sendData["FRIENDS"] = Friend;	199	sendData["FRIEND"] = Friend;
200	sendData["METHOD"] = "deletefriend";	200	sendData["METHOD"] = "deletefriend";
201		201
202	string reqString = ServerUtils.BuildQueryString(sendData);	202	string reqString = ServerUtils.BuildQueryString(sendData);