aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2009-10-17 14:51:17 +0100
committerMelanie2009-10-17 14:51:17 +0100
commitcdcbd22ba861d7f28a2ef6ee8840fd5652536920 (patch)
treedf67c94b5d3082240203bcdcf9f4635a8dc186ba /OpenSim
parentMerge branch 'master' into prioritization (diff)
parentAdds SendAvatarInterestsUpdate to IClientAPI (diff)
downloadopensim-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 '')
-rw-r--r--OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs6
-rw-r--r--OpenSim/Framework/IClientAPI.cs1
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs7
3 files changed, 14 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();
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
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