diff options
| author | UbitUmarov | 2012-08-25 15:21:51 +0100 |
|---|---|---|
| committer | UbitUmarov | 2012-08-25 15:21:51 +0100 |
| commit | 9a803308755200c0449e409fd3c22d45bca9e95c (patch) | |
| tree | 2100bd63e85a37948dfc74a07f1d70a82a665048 /OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs | |
| parent | Merge branch 'avination' into ubitwork (diff) | |
| parent | Merge branch 'ubitwork' into avination (diff) | |
| download | opensim-SC-9a803308755200c0449e409fd3c22d45bca9e95c.zip opensim-SC-9a803308755200c0449e409fd3c22d45bca9e95c.tar.gz opensim-SC-9a803308755200c0449e409fd3c22d45bca9e95c.tar.bz2 opensim-SC-9a803308755200c0449e409fd3c22d45bca9e95c.tar.xz | |
Merge branch 'avination' into ubitwork
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs index bb43cd2..c24a000 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs | |||
| @@ -51,7 +51,8 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 51 | public enum EventType : int | 51 | public enum EventType : int |
| 52 | { | 52 | { |
| 53 | Normal = 0, | 53 | Normal = 0, |
| 54 | LslHttp = 1 | 54 | LslHttp = 1, |
| 55 | Inventory = 2 | ||
| 55 | } | 56 | } |
| 56 | 57 | ||
| 57 | public PollServiceEventArgs( | 58 | public PollServiceEventArgs( |