diff options
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs index 3089351..bb43cd2 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs | |||
@@ -45,17 +45,27 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
45 | public NoEventsMethod NoEvents; | 45 | public NoEventsMethod NoEvents; |
46 | public RequestMethod Request; | 46 | public RequestMethod Request; |
47 | public UUID Id; | 47 | public UUID Id; |
48 | public int TimeOutms; | ||
49 | public EventType Type; | ||
50 | |||
51 | public enum EventType : int | ||
52 | { | ||
53 | Normal = 0, | ||
54 | LslHttp = 1 | ||
55 | } | ||
48 | 56 | ||
49 | public PollServiceEventArgs( | 57 | public PollServiceEventArgs( |
50 | RequestMethod pRequest, | 58 | RequestMethod pRequest, |
51 | HasEventsMethod pHasEvents, GetEventsMethod pGetEvents, NoEventsMethod pNoEvents, | 59 | HasEventsMethod pHasEvents, GetEventsMethod pGetEvents, NoEventsMethod pNoEvents, |
52 | UUID pId) | 60 | UUID pId, int pTimeOutms) |
53 | { | 61 | { |
54 | Request = pRequest; | 62 | Request = pRequest; |
55 | HasEvents = pHasEvents; | 63 | HasEvents = pHasEvents; |
56 | GetEvents = pGetEvents; | 64 | GetEvents = pGetEvents; |
57 | NoEvents = pNoEvents; | 65 | NoEvents = pNoEvents; |
58 | Id = pId; | 66 | Id = pId; |
67 | TimeOutms = pTimeOutms; | ||
68 | Type = EventType.Normal; | ||
59 | } | 69 | } |
60 | } | 70 | } |
61 | } \ No newline at end of file | 71 | } |