diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Environment/Modules/FriendsModule.cs | 9 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/FriendsModule.cs b/OpenSim/Region/Environment/Modules/FriendsModule.cs index 53ed74a..4081a75 100644 --- a/OpenSim/Region/Environment/Modules/FriendsModule.cs +++ b/OpenSim/Region/Environment/Modules/FriendsModule.cs | |||
@@ -61,6 +61,8 @@ namespace OpenSim.Region.Environment.Modules | |||
61 | } | 61 | } |
62 | scene.EventManager.OnNewClient += OnNewClient; | 62 | scene.EventManager.OnNewClient += OnNewClient; |
63 | scene.EventManager.OnGridInstantMessageToFriendsModule += OnGridInstantMessage; | 63 | scene.EventManager.OnGridInstantMessageToFriendsModule += OnGridInstantMessage; |
64 | scene.EventManager.OnAvatarEnteringNewParcel += AvatarEnteringParcel; | ||
65 | |||
64 | 66 | ||
65 | } | 67 | } |
66 | public XmlRpcResponse processPresenceUpdate(XmlRpcRequest req) | 68 | public XmlRpcResponse processPresenceUpdate(XmlRpcRequest req) |
@@ -82,10 +84,17 @@ namespace OpenSim.Region.Environment.Modules | |||
82 | client.OnApproveFriendRequest += OnApprovedFriendRequest; | 84 | client.OnApproveFriendRequest += OnApprovedFriendRequest; |
83 | client.OnDenyFriendRequest += OnDenyFriendRequest; | 85 | client.OnDenyFriendRequest += OnDenyFriendRequest; |
84 | client.OnTerminateFriendship += OnTerminateFriendship; | 86 | client.OnTerminateFriendship += OnTerminateFriendship; |
87 | |||
88 | |||
85 | 89 | ||
86 | 90 | ||
87 | } | 91 | } |
88 | 92 | ||
93 | private void AvatarEnteringParcel(ScenePresence avatar, int localLandID, LLUUID regionID) | ||
94 | { | ||
95 | int i = 0; | ||
96 | } | ||
97 | |||
89 | private void OnInstantMessage(IClientAPI client,LLUUID fromAgentID, | 98 | private void OnInstantMessage(IClientAPI client,LLUUID fromAgentID, |
90 | LLUUID fromAgentSession, LLUUID toAgentID, | 99 | LLUUID fromAgentSession, LLUUID toAgentID, |
91 | LLUUID imSessionID, uint timestamp, string fromAgentName, | 100 | LLUUID imSessionID, uint timestamp, string fromAgentName, |
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 9b80444..9f3c924 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -1484,7 +1484,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1484 | if (Util.GetDistanceTo(AbsolutePosition, posLastSignificantMove) > 0.5) | 1484 | if (Util.GetDistanceTo(AbsolutePosition, posLastSignificantMove) > 0.5) |
1485 | { | 1485 | { |
1486 | posLastSignificantMove = AbsolutePosition; | 1486 | posLastSignificantMove = AbsolutePosition; |
1487 | 1487 | handler001 = OnSignificantClientMovement; | |
1488 | if (handler001 != null) | 1488 | if (handler001 != null) |
1489 | { | 1489 | { |
1490 | handler001(m_controllingClient); | 1490 | handler001(m_controllingClient); |