OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix: Unable to remove AV from friend list (sqldb-bug) http://opensimulator.org/mantis/view.php?id=3731

iar_mods
PixelTomsen 2012-02-08 21:45:00 +01:00 committed by Justin Clark-Casey (justincc)
parent ddca5347c3
commit 7273e05995
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Data/SQLite/SQLiteFriendsData.cs
View File

@ -75,7 +75,7 @@ namespace OpenSim.Data.SQLite
cmd.Parameters.AddWithValue(":PrincipalID", principalID.ToString()); cmd.Parameters.AddWithValue(":PrincipalID", principalID.ToString());
cmd.Parameters.AddWithValue(":Friend", friend); cmd.Parameters.AddWithValue(":Friend", friend);
ExecuteNonQuery(cmd, cmd.Connection); ExecuteNonQuery(cmd, m_Connection);
return true; return true;
} }

14
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -5107,7 +5107,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
AddLocalPacketHandler(PacketType.ImprovedInstantMessage, HandlerImprovedInstantMessage, false); AddLocalPacketHandler(PacketType.ImprovedInstantMessage, HandlerImprovedInstantMessage, false);
AddLocalPacketHandler(PacketType.AcceptFriendship, HandlerAcceptFriendship); AddLocalPacketHandler(PacketType.AcceptFriendship, HandlerAcceptFriendship);
AddLocalPacketHandler(PacketType.DeclineFriendship, HandlerDeclineFriendship); AddLocalPacketHandler(PacketType.DeclineFriendship, HandlerDeclineFriendship);
AddLocalPacketHandler(PacketType.TerminateFriendship, HandlerTerminateFrendship); AddLocalPacketHandler(PacketType.TerminateFriendship, HandlerTerminateFriendship);
AddLocalPacketHandler(PacketType.RezObject, HandlerRezObject); AddLocalPacketHandler(PacketType.RezObject, HandlerRezObject);
AddLocalPacketHandler(PacketType.DeRezObject, HandlerDeRezObject); AddLocalPacketHandler(PacketType.DeRezObject, HandlerDeRezObject);
AddLocalPacketHandler(PacketType.ModifyLand, HandlerModifyLand); AddLocalPacketHandler(PacketType.ModifyLand, HandlerModifyLand);
@ -5827,7 +5827,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
return true; return true;
} }
private bool HandlerTerminateFrendship(IClientAPI sender, Packet Pack) private bool HandlerTerminateFriendship(IClientAPI sender, Packet Pack)
{ {
TerminateFriendshipPacket tfriendpack = (TerminateFriendshipPacket)Pack; TerminateFriendshipPacket tfriendpack = (TerminateFriendshipPacket)Pack;
@ -5842,13 +5842,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
UUID listOwnerAgentID = tfriendpack.AgentData.AgentID; UUID listOwnerAgentID = tfriendpack.AgentData.AgentID;
UUID exFriendID = tfriendpack.ExBlock.OtherID; UUID exFriendID = tfriendpack.ExBlock.OtherID;
FriendshipTermination TerminateFriendshipHandler = OnTerminateFriendship;
FriendshipTermination handlerTerminateFriendship = OnTerminateFriendship; if (TerminateFriendshipHandler != null)
if (handlerTerminateFriendship != null)
{ {
handlerTerminateFriendship(this, listOwnerAgentID, exFriendID); TerminateFriendshipHandler(this, listOwnerAgentID, exFriendID);
return true;
} }
return true; return false;
} }
private bool HandleFindAgent(IClientAPI client, Packet Packet) private bool HandleFindAgent(IClientAPI client, Packet Packet)