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.cs14
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
2 files changed, 16 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs b/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs
index d4a6857..8143164 100644
--- a/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs
@@ -33,6 +33,20 @@ namespace OpenSim.Region.Framework.Interfaces
33{ 33{
34 public interface IFriendsModule 34 public interface IFriendsModule
35 { 35 {
36 /// <summary>
37 /// Add a friend for the given user.
38 /// </summary>
39 /// <remarks>
40 /// This is a one-way friendship. To make a two way friendship you will need to call this again with the
41 /// client and friend reversed.
42 ///
43 /// Ultimately, it would be more useful to take in a user account here rather than having to have a user
44 /// present in the scene.
45 /// </remarks>
46 /// <param name="client"></param>
47 /// <param name="friendID"></param>
48 void AddFriend(IClientAPI client, UUID friendID);
49
36 uint GetFriendPerms(UUID PrincipalID, UUID FriendID); 50 uint GetFriendPerms(UUID PrincipalID, UUID FriendID);
37 bool SendFriendsOnlineIfNeeded(IClientAPI client); 51 bool SendFriendsOnlineIfNeeded(IClientAPI client);
38 } 52 }
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 087697f..8906c6f 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2862,6 +2862,8 @@ namespace OpenSim.Region.Framework.Scenes
2862 Velocity = Vector3.Zero; 2862 Velocity = Vector3.Zero;
2863 AbsolutePosition = pos; 2863 AbsolutePosition = pos;
2864 2864
2865// m_log.DebugFormat("[SCENE PRESENCE]: Prevented flyoff for {0} at {1}", Name, AbsolutePosition);
2866
2865 AddToPhysicalScene(isFlying); 2867 AddToPhysicalScene(isFlying);
2866 } 2868 }
2867 } 2869 }