aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie2009-10-17 14:51:17 +0100
committerMelanie2009-10-17 14:51:17 +0100
commitcdcbd22ba861d7f28a2ef6ee8840fd5652536920 (patch)
treedf67c94b5d3082240203bcdcf9f4635a8dc186ba /OpenSim/Framework
parentMerge branch 'master' into prioritization (diff)
parentAdds SendAvatarInterestsUpdate to IClientAPI (diff)
downloadopensim-SC_OLD-cdcbd22ba861d7f28a2ef6ee8840fd5652536920.zip
opensim-SC_OLD-cdcbd22ba861d7f28a2ef6ee8840fd5652536920.tar.gz
opensim-SC_OLD-cdcbd22ba861d7f28a2ef6ee8840fd5652536920.tar.bz2
opensim-SC_OLD-cdcbd22ba861d7f28a2ef6ee8840fd5652536920.tar.xz
Merge branch 'master' into prioritization
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/IClientAPI.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 4b51e15..9aa3af1 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1019,6 +1019,7 @@ namespace OpenSim.Framework
1019 event PickGodDelete OnPickGodDelete; 1019 event PickGodDelete OnPickGodDelete;
1020 event PickInfoUpdate OnPickInfoUpdate; 1020 event PickInfoUpdate OnPickInfoUpdate;
1021 event AvatarNotesUpdate OnAvatarNotesUpdate; 1021 event AvatarNotesUpdate OnAvatarNotesUpdate;
1022 event AvatarInterestUpdate OnAvatarInterestUpdate;
1022 1023
1023 event MuteListRequest OnMuteListRequest; 1024 event MuteListRequest OnMuteListRequest;
1024 1025