diff options
| author | Melanie | 2012-11-17 02:58:14 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-17 02:58:14 +0000 |
| commit | 7ad082f7c39ba82adeae3c25ca0befcf983c879d (patch) | |
| tree | 0e3c488c65ef22b53e4536dd07f46c1467b58f78 /OpenSim/Region/OptionalModules/Agent | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Prevent a buffer overflow in asset receiving (diff) | |
| download | opensim-SC-7ad082f7c39ba82adeae3c25ca0befcf983c879d.zip opensim-SC-7ad082f7c39ba82adeae3c25ca0befcf983c879d.tar.gz opensim-SC-7ad082f7c39ba82adeae3c25ca0befcf983c879d.tar.bz2 opensim-SC-7ad082f7c39ba82adeae3c25ca0befcf983c879d.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/OptionalModules/Agent')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index c363fd3..254eeb4 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
| @@ -873,6 +873,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
| 873 | public event MuteListEntryRemove OnRemoveMuteListEntry; | 873 | public event MuteListEntryRemove OnRemoveMuteListEntry; |
| 874 | public event GodlikeMessage onGodlikeMessage; | 874 | public event GodlikeMessage onGodlikeMessage; |
| 875 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; | 875 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; |
| 876 | public event GenericCall2 OnUpdateThrottles; | ||
| 876 | 877 | ||
| 877 | #pragma warning restore 67 | 878 | #pragma warning restore 67 |
| 878 | 879 | ||