aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Interfaces/IFriendsModule.cs11
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
2 files changed, 13 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs b/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs
index d4a6857..fdede34 100644
--- a/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs
@@ -33,6 +33,17 @@ namespace OpenSim.Region.Framework.Interfaces
33{ 33{
34 public interface IFriendsModule 34 public interface IFriendsModule
35 { 35 {
36 /// <summary>
37 /// Add a friendship between two users.
38 /// </summary>
39 /// <remarks>
40 /// Ultimately, it would be more useful to take in a user account here rather than having to have a user
41 /// present in the scene.
42 /// </remarks>
43 /// <param name="client"></param>
44 /// <param name="friendID"></param>
45 void AddFriendship(IClientAPI client, UUID friendID);
46
36 uint GetFriendPerms(UUID PrincipalID, UUID FriendID); 47 uint GetFriendPerms(UUID PrincipalID, UUID FriendID);
37 bool SendFriendsOnlineIfNeeded(IClientAPI client); 48 bool SendFriendsOnlineIfNeeded(IClientAPI client);
38 } 49 }
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index a4cb7cf..098437a 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2828,6 +2828,8 @@ namespace OpenSim.Region.Framework.Scenes
2828 Velocity = Vector3.Zero; 2828 Velocity = Vector3.Zero;
2829 AbsolutePosition = pos; 2829 AbsolutePosition = pos;
2830 2830
2831// m_log.DebugFormat("[SCENE PRESENCE]: Prevented flyoff for {0} at {1}", Name, AbsolutePosition);
2832
2831 AddToPhysicalScene(isFlying); 2833 AddToPhysicalScene(isFlying);
2832 } 2834 }
2833 } 2835 }