diff options
Merge commit '120114e96becc6fee1311300359dcefaf4013c0e' into bigmerge
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index a3b65cf..9fa243e 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
@@ -867,10 +867,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
867 | 867 | ||
868 | #pragma warning restore 67 | 868 | #pragma warning restore 67 |
869 | 869 | ||
870 | public void SetDebugPacketLevel(int newDebug) | 870 | public int DebugPacketLevel { get; set; } |
871 | { | ||
872 | |||
873 | } | ||
874 | 871 | ||
875 | public void InPacket(object NewPack) | 872 | public void InPacket(object NewPack) |
876 | { | 873 | { |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index fd2b9c7..a29ed21 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -823,9 +823,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
823 | { | 823 | { |
824 | } | 824 | } |
825 | 825 | ||
826 | public void SetDebugPacketLevel(int newDebug) | 826 | public int DebugPacketLevel { get; set; } |
827 | { | ||
828 | } | ||
829 | 827 | ||
830 | public void InPacket(object NewPack) | 828 | public void InPacket(object NewPack) |
831 | { | 829 | { |