diff options
author | Melanie | 2010-12-24 03:46:57 +0100 |
---|---|---|
committer | Melanie | 2010-12-24 03:46:57 +0100 |
commit | 42d44c00f38d6c7f5a67920ff375ab20ceb24fe9 (patch) | |
tree | 70e2a650a24047da9b40d9486796c37b146e9331 | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC-42d44c00f38d6c7f5a67920ff375ab20ceb24fe9.zip opensim-SC-42d44c00f38d6c7f5a67920ff375ab20ceb24fe9.tar.gz opensim-SC-42d44c00f38d6c7f5a67920ff375ab20ceb24fe9.tar.bz2 opensim-SC-42d44c00f38d6c7f5a67920ff375ab20ceb24fe9.tar.xz |
Change the mute list parts of the client interface so that all data is provided
to the module
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index da893b6..ea081e2 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -463,9 +463,9 @@ namespace OpenSim.Framework | |||
463 | 463 | ||
464 | public delegate void AgentFOV(IClientAPI client, float verticalAngle); | 464 | public delegate void AgentFOV(IClientAPI client, float verticalAngle); |
465 | 465 | ||
466 | public delegate void MuteListEntryUpdate(IClientAPI client, UUID MuteID, string Name, int Flags,UUID AgentID); | 466 | public delegate void MuteListEntryUpdate(IClientAPI client, UUID MuteID, string Name, int type, uint flags); |
467 | 467 | ||
468 | public delegate void MuteListEntryRemove(IClientAPI client, UUID MuteID, string Name, UUID AgentID); | 468 | public delegate void MuteListEntryRemove(IClientAPI client, UUID MuteID, string Name); |
469 | 469 | ||
470 | public delegate void AvatarInterestReply(IClientAPI client,UUID target, uint wantmask, string wanttext, uint skillsmask, string skillstext, string languages); | 470 | public delegate void AvatarInterestReply(IClientAPI client,UUID target, uint wantmask, string wanttext, uint skillsmask, string skillstext, string languages); |
471 | 471 | ||
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 870ce3e..5913246 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -9475,7 +9475,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
9475 | handlerUpdateMuteListEntry(this, UpdateMuteListEntry.MuteData.MuteID, | 9475 | handlerUpdateMuteListEntry(this, UpdateMuteListEntry.MuteData.MuteID, |
9476 | Utils.BytesToString(UpdateMuteListEntry.MuteData.MuteName), | 9476 | Utils.BytesToString(UpdateMuteListEntry.MuteData.MuteName), |
9477 | UpdateMuteListEntry.MuteData.MuteType, | 9477 | UpdateMuteListEntry.MuteData.MuteType, |
9478 | UpdateMuteListEntry.AgentData.AgentID); | 9478 | UpdateMuteListEntry.MuteData.MuteFlags); |
9479 | return true; | 9479 | return true; |
9480 | } | 9480 | } |
9481 | return false; | 9481 | return false; |
@@ -9490,8 +9490,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
9490 | { | 9490 | { |
9491 | handlerRemoveMuteListEntry(this, | 9491 | handlerRemoveMuteListEntry(this, |
9492 | RemoveMuteListEntry.MuteData.MuteID, | 9492 | RemoveMuteListEntry.MuteData.MuteID, |
9493 | Utils.BytesToString(RemoveMuteListEntry.MuteData.MuteName), | 9493 | Utils.BytesToString(RemoveMuteListEntry.MuteData.MuteName)); |
9494 | RemoveMuteListEntry.AgentData.AgentID); | ||
9495 | return true; | 9494 | return true; |
9496 | } | 9495 | } |
9497 | return false; | 9496 | return false; |