diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs | 19 | ||||
-rw-r--r-- | OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs | 2 |
2 files changed, 17 insertions, 4 deletions
diff --git a/OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs b/OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs index 9969086..fc97d8c 100644 --- a/OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs | |||
@@ -160,9 +160,9 @@ namespace OpenSim.Server.Handlers.Friends | |||
160 | 160 | ||
161 | byte[] StoreFriend(Dictionary<string, object> request) | 161 | byte[] StoreFriend(Dictionary<string, object> request) |
162 | { | 162 | { |
163 | FriendInfo friend = new FriendInfo(request); | 163 | string principalID = string.Empty, friend = string.Empty; int flags = 0; |
164 | 164 | FromKeyValuePairs(request, out principalID, out friend, out flags); | |
165 | bool success = m_FriendsService.StoreFriend(friend.PrincipalID.ToString(), friend.Friend, friend.MyFlags); | 165 | bool success = m_FriendsService.StoreFriend(principalID, friend, flags); |
166 | 166 | ||
167 | if (success) | 167 | if (success) |
168 | return SuccessResult(); | 168 | return SuccessResult(); |
@@ -275,6 +275,19 @@ namespace OpenSim.Server.Handlers.Friends | |||
275 | return ms.ToArray(); | 275 | return ms.ToArray(); |
276 | } | 276 | } |
277 | 277 | ||
278 | void FromKeyValuePairs(Dictionary<string, object> kvp, out string principalID, out string friend, out int flags) | ||
279 | { | ||
280 | principalID = string.Empty; | ||
281 | if (kvp.ContainsKey("PrincipalID") && kvp["PrincipalID"] != null) | ||
282 | principalID = kvp["PrincipalID"].ToString(); | ||
283 | friend = string.Empty; | ||
284 | if (kvp.ContainsKey("Friend") && kvp["Friend"] != null) | ||
285 | friend = kvp["Friend"].ToString(); | ||
286 | flags = 0; | ||
287 | if (kvp.ContainsKey("MyFlags") && kvp["MyFlags"] != null) | ||
288 | Int32.TryParse(kvp["MyFlags"].ToString(), out flags); | ||
289 | } | ||
290 | |||
278 | #endregion | 291 | #endregion |
279 | } | 292 | } |
280 | } | 293 | } |
diff --git a/OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs index 74b7422..80eb5d2 100644 --- a/OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs +++ b/OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs | |||
@@ -72,7 +72,7 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
72 | if (m_IMService == null) | 72 | if (m_IMService == null) |
73 | throw new Exception("InstantMessage server connector cannot proceed because of missing service"); | 73 | throw new Exception("InstantMessage server connector cannot proceed because of missing service"); |
74 | 74 | ||
75 | MainServer.Instance.AddXmlRPCHandler("grid_instant_message", ProcessInstantMessage, false); | 75 | server.AddXmlRPCHandler("grid_instant_message", ProcessInstantMessage, false); |
76 | 76 | ||
77 | } | 77 | } |
78 | 78 | ||