aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/SQLite/SQLiteFriendsData.cs2
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs14
2 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteFriendsData.cs b/OpenSim/Data/SQLite/SQLiteFriendsData.cs
index b14c348..5f68977 100644
--- a/OpenSim/Data/SQLite/SQLiteFriendsData.cs
+++ b/OpenSim/Data/SQLite/SQLiteFriendsData.cs
@@ -75,7 +75,7 @@ namespace OpenSim.Data.SQLite
75 cmd.Parameters.AddWithValue(":PrincipalID", principalID.ToString()); 75 cmd.Parameters.AddWithValue(":PrincipalID", principalID.ToString());
76 cmd.Parameters.AddWithValue(":Friend", friend); 76 cmd.Parameters.AddWithValue(":Friend", friend);
77 77
78 ExecuteNonQuery(cmd, cmd.Connection); 78 ExecuteNonQuery(cmd, m_Connection);
79 79
80 return true; 80 return true;
81 } 81 }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 8273c6f..ff96f4d 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5107,7 +5107,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5107 AddLocalPacketHandler(PacketType.ImprovedInstantMessage, HandlerImprovedInstantMessage, false); 5107 AddLocalPacketHandler(PacketType.ImprovedInstantMessage, HandlerImprovedInstantMessage, false);
5108 AddLocalPacketHandler(PacketType.AcceptFriendship, HandlerAcceptFriendship); 5108 AddLocalPacketHandler(PacketType.AcceptFriendship, HandlerAcceptFriendship);
5109 AddLocalPacketHandler(PacketType.DeclineFriendship, HandlerDeclineFriendship); 5109 AddLocalPacketHandler(PacketType.DeclineFriendship, HandlerDeclineFriendship);
5110 AddLocalPacketHandler(PacketType.TerminateFriendship, HandlerTerminateFrendship); 5110 AddLocalPacketHandler(PacketType.TerminateFriendship, HandlerTerminateFriendship);
5111 AddLocalPacketHandler(PacketType.RezObject, HandlerRezObject); 5111 AddLocalPacketHandler(PacketType.RezObject, HandlerRezObject);
5112 AddLocalPacketHandler(PacketType.DeRezObject, HandlerDeRezObject); 5112 AddLocalPacketHandler(PacketType.DeRezObject, HandlerDeRezObject);
5113 AddLocalPacketHandler(PacketType.ModifyLand, HandlerModifyLand); 5113 AddLocalPacketHandler(PacketType.ModifyLand, HandlerModifyLand);
@@ -5827,7 +5827,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5827 return true; 5827 return true;
5828 } 5828 }
5829 5829
5830 private bool HandlerTerminateFrendship(IClientAPI sender, Packet Pack) 5830 private bool HandlerTerminateFriendship(IClientAPI sender, Packet Pack)
5831 { 5831 {
5832 TerminateFriendshipPacket tfriendpack = (TerminateFriendshipPacket)Pack; 5832 TerminateFriendshipPacket tfriendpack = (TerminateFriendshipPacket)Pack;
5833 5833
@@ -5842,13 +5842,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5842 5842
5843 UUID listOwnerAgentID = tfriendpack.AgentData.AgentID; 5843 UUID listOwnerAgentID = tfriendpack.AgentData.AgentID;
5844 UUID exFriendID = tfriendpack.ExBlock.OtherID; 5844 UUID exFriendID = tfriendpack.ExBlock.OtherID;
5845 5845 FriendshipTermination TerminateFriendshipHandler = OnTerminateFriendship;
5846 FriendshipTermination handlerTerminateFriendship = OnTerminateFriendship; 5846 if (TerminateFriendshipHandler != null)
5847 if (handlerTerminateFriendship != null)
5848 { 5847 {
5849 handlerTerminateFriendship(this, listOwnerAgentID, exFriendID); 5848 TerminateFriendshipHandler(this, listOwnerAgentID, exFriendID);
5849 return true;
5850 } 5850 }
5851 return true; 5851 return false;
5852 } 5852 }
5853 5853
5854 private bool HandleFindAgent(IClientAPI client, Packet Packet) 5854 private bool HandleFindAgent(IClientAPI client, Packet Packet)