Merge branch 'master' into prioritization

This commit is contained in:
Melanie
2009-10-17 14:51:17 +01:00
3 changed files with 14 additions and 0 deletions

View File

@@ -1019,6 +1019,7 @@ namespace OpenSim.Framework
event PickGodDelete OnPickGodDelete;
event PickInfoUpdate OnPickInfoUpdate;
event AvatarNotesUpdate OnAvatarNotesUpdate;
event AvatarInterestUpdate OnAvatarInterestUpdate;
event MuteListRequest OnMuteListRequest;