aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors
diff options
context:
space:
mode:
authorMelanie2012-10-20 02:33:24 +0100
committerMelanie2012-10-20 02:33:24 +0100
commit6ad8d3c43f130dfb80a7543e139ffa4dacb840ad (patch)
tree24baeecab6becf3bb30c26046ea95b75e6bbdc0f /OpenSim/Services/Connectors
parentMerge branch 'master' into careminster (diff)
parentminor: Rename assetCache constructor param in UUIDGatherer to assetService wh... (diff)
downloadopensim-SC_OLD-6ad8d3c43f130dfb80a7543e139ffa4dacb840ad.zip
opensim-SC_OLD-6ad8d3c43f130dfb80a7543e139ffa4dacb840ad.tar.gz
opensim-SC_OLD-6ad8d3c43f130dfb80a7543e139ffa4dacb840ad.tar.bz2
opensim-SC_OLD-6ad8d3c43f130dfb80a7543e139ffa4dacb840ad.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Services/Connectors')
-rw-r--r--OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
index 4ec1edc..45f4514 100644
--- a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
+++ b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
@@ -128,7 +128,7 @@ namespace OpenSim.Services.Connectors.Friends
128 return Call(region, sendData); 128 return Call(region, sendData);
129 } 129 }
130 130
131 public bool StatusNotify(GridRegion region, UUID userID, UUID friendID, bool online) 131 public bool StatusNotify(GridRegion region, UUID userID, string friendID, bool online)
132 { 132 {
133 Dictionary<string, object> sendData = new Dictionary<string, object>(); 133 Dictionary<string, object> sendData = new Dictionary<string, object>();
134 //sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString(); 134 //sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
@@ -136,7 +136,7 @@ namespace OpenSim.Services.Connectors.Friends
136 sendData["METHOD"] = "status"; 136 sendData["METHOD"] = "status";
137 137
138 sendData["FromID"] = userID.ToString(); 138 sendData["FromID"] = userID.ToString();
139 sendData["ToID"] = friendID.ToString(); 139 sendData["ToID"] = friendID;
140 sendData["Online"] = online.ToString(); 140 sendData["Online"] = online.ToString();
141 141
142 return Call(region, sendData); 142 return Call(region, sendData);