OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into prioritization

prioritization
Melanie 2009-10-17 14:51:17 +01:00
parent e5ccd3f793 c7da13eb23
commit cdcbd22ba8
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
View File

@ -402,6 +402,7 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
public event PickInfoUpdate OnPickInfoUpdate = delegate { }; public event PickInfoUpdate OnPickInfoUpdate = delegate { };
public event AvatarNotesUpdate OnAvatarNotesUpdate = delegate { }; public event AvatarNotesUpdate OnAvatarNotesUpdate = delegate { };
public event MuteListRequest OnMuteListRequest = delegate { }; public event MuteListRequest OnMuteListRequest = delegate { };
public event AvatarInterestUpdate OnAvatarInterestUpdate = delegate { };
public event PlacesQuery OnPlacesQuery = delegate { }; public event PlacesQuery OnPlacesQuery = delegate { };
@ -1113,6 +1114,11 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
throw new System.NotImplementedException(); throw new System.NotImplementedException();
} }
public void SendAvatarInterestUpdate(IClientAPI client, uint wantmask, string wanttext, uint skillsmask, string skillstext, string languages)
{
throw new System.NotImplementedException();
}
public void SendParcelDwellReply(int localID, UUID parcelID, float dwell) public void SendParcelDwellReply(int localID, UUID parcelID, float dwell)
{ {
throw new System.NotImplementedException(); throw new System.NotImplementedException();

1
OpenSim/Framework/IClientAPI.cs
View File

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

7
OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
View File

@ -831,7 +831,9 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
public event PickInfoUpdate OnPickInfoUpdate; public event PickInfoUpdate OnPickInfoUpdate;
public event AvatarNotesUpdate OnAvatarNotesUpdate; public event AvatarNotesUpdate OnAvatarNotesUpdate;
public event MuteListRequest OnMuteListRequest; public event MuteListRequest OnMuteListRequest;
public event AvatarInterestUpdate OnAvatarInterestUpdate;
public event PlacesQuery OnPlacesQuery; public event PlacesQuery OnPlacesQuery;
#pragma warning restore 67 #pragma warning restore 67
public void SetDebugPacketLevel(int newDebug) public void SetDebugPacketLevel(int newDebug)
@ -1565,6 +1567,11 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
} }
public void SendAvatarInterestUpdate(IClientAPI client, uint wantmask, string wanttext, uint skillsmask, string skillstext, string languages)
{
}
public void SendParcelDwellReply(int localID, UUID parcelID, float dwell) public void SendParcelDwellReply(int localID, UUID parcelID, float dwell)
{ {