aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client
diff options
context:
space:
mode:
authorMelanie2009-10-17 14:51:17 +0100
committerMelanie2009-10-17 14:51:17 +0100
commitcdcbd22ba861d7f28a2ef6ee8840fd5652536920 (patch)
treedf67c94b5d3082240203bcdcf9f4635a8dc186ba /OpenSim/Client
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/Client')
-rw-r--r--OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
index 3a48a03..d6990de 100644
--- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
+++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
@@ -402,6 +402,7 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
402 public event PickInfoUpdate OnPickInfoUpdate = delegate { }; 402 public event PickInfoUpdate OnPickInfoUpdate = delegate { };
403 public event AvatarNotesUpdate OnAvatarNotesUpdate = delegate { }; 403 public event AvatarNotesUpdate OnAvatarNotesUpdate = delegate { };
404 public event MuteListRequest OnMuteListRequest = delegate { }; 404 public event MuteListRequest OnMuteListRequest = delegate { };
405 public event AvatarInterestUpdate OnAvatarInterestUpdate = delegate { };
405 public event PlacesQuery OnPlacesQuery = delegate { }; 406 public event PlacesQuery OnPlacesQuery = delegate { };
406 407
407 408
@@ -1113,6 +1114,11 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
1113 throw new System.NotImplementedException(); 1114 throw new System.NotImplementedException();
1114 } 1115 }
1115 1116
1117 public void SendAvatarInterestUpdate(IClientAPI client, uint wantmask, string wanttext, uint skillsmask, string skillstext, string languages)
1118 {
1119 throw new System.NotImplementedException();
1120 }
1121
1116 public void SendParcelDwellReply(int localID, UUID parcelID, float dwell) 1122 public void SendParcelDwellReply(int localID, UUID parcelID, float dwell)
1117 { 1123 {
1118 throw new System.NotImplementedException(); 1124 throw new System.NotImplementedException();