diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs index a9860cc..a1bc27b 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs | |||
| @@ -48,14 +48,14 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 48 | public DropMethod Drop; | 48 | public DropMethod Drop; |
| 49 | public UUID Id; | 49 | public UUID Id; |
| 50 | public int TimeOutms; | 50 | public int TimeOutms; |
| 51 | public EventType Type; | 51 | public EventType Type; |
| 52 | 52 | ||
| 53 | public enum EventType : int | 53 | public enum EventType : int |
| 54 | { | 54 | { |
| 55 | LongPoll = 0, | 55 | LongPoll = 0, |
| 56 | LslHttp = 1, | 56 | LslHttp = 1, |
| 57 | Inventory = 2, | 57 | Inventory = 2, |
| 58 | Texture = 3, | 58 | Texture = 3, |
| 59 | Mesh = 4 | 59 | Mesh = 4 |
| 60 | } | 60 | } |
| 61 | 61 | ||