diff options
author | Melanie | 2009-10-17 14:51:17 +0100 |
---|---|---|
committer | Melanie | 2009-10-17 14:51:17 +0100 |
commit | cdcbd22ba861d7f28a2ef6ee8840fd5652536920 (patch) | |
tree | df67c94b5d3082240203bcdcf9f4635a8dc186ba /OpenSim/Region | |
parent | Merge branch 'master' into prioritization (diff) | |
parent | Adds SendAvatarInterestsUpdate to IClientAPI (diff) | |
download | opensim-SC-cdcbd22ba861d7f28a2ef6ee8840fd5652536920.zip opensim-SC-cdcbd22ba861d7f28a2ef6ee8840fd5652536920.tar.gz opensim-SC-cdcbd22ba861d7f28a2ef6ee8840fd5652536920.tar.bz2 opensim-SC-cdcbd22ba861d7f28a2ef6ee8840fd5652536920.tar.xz |
Merge branch 'master' into prioritization
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 8ad9327..1a24dec 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
@@ -831,7 +831,9 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
831 | public event PickInfoUpdate OnPickInfoUpdate; | 831 | public event PickInfoUpdate OnPickInfoUpdate; |
832 | public event AvatarNotesUpdate OnAvatarNotesUpdate; | 832 | public event AvatarNotesUpdate OnAvatarNotesUpdate; |
833 | public event MuteListRequest OnMuteListRequest; | 833 | public event MuteListRequest OnMuteListRequest; |
834 | public event AvatarInterestUpdate OnAvatarInterestUpdate; | ||
834 | public event PlacesQuery OnPlacesQuery; | 835 | public event PlacesQuery OnPlacesQuery; |
836 | |||
835 | #pragma warning restore 67 | 837 | #pragma warning restore 67 |
836 | 838 | ||
837 | public void SetDebugPacketLevel(int newDebug) | 839 | public void SetDebugPacketLevel(int newDebug) |
@@ -1565,6 +1567,11 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
1565 | 1567 | ||
1566 | } | 1568 | } |
1567 | 1569 | ||
1570 | public void SendAvatarInterestUpdate(IClientAPI client, uint wantmask, string wanttext, uint skillsmask, string skillstext, string languages) | ||
1571 | { | ||
1572 | |||
1573 | } | ||
1574 | |||
1568 | public void SendParcelDwellReply(int localID, UUID parcelID, float dwell) | 1575 | public void SendParcelDwellReply(int localID, UUID parcelID, float dwell) |
1569 | { | 1576 | { |
1570 | 1577 | ||