aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
diff options
context:
space:
mode:
authorubit2012-07-06 02:10:05 +0200
committerubit2012-07-06 02:10:05 +0200
commita2c0de4c106fd04c9490deb161206ccb26ed0f53 (patch)
tree1382449c2bfe54d2babf925307b1b87ee7657f99 /OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parentChanged GetTexture error code RequestedRangeNotSatisfiable to NotFound, since... (diff)
downloadopensim-SC-a2c0de4c106fd04c9490deb161206ccb26ed0f53.zip
opensim-SC-a2c0de4c106fd04c9490deb161206ccb26ed0f53.tar.gz
opensim-SC-a2c0de4c106fd04c9490deb161206ccb26ed0f53.tar.bz2
opensim-SC-a2c0de4c106fd04c9490deb161206ccb26ed0f53.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs8
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
index 2407533..7c92a50 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
@@ -45,6 +45,13 @@ namespace OpenSim.Framework.Servers.HttpServer
45 public RequestMethod Request; 45 public RequestMethod Request;
46 public UUID Id; 46 public UUID Id;
47 public int TimeOutms; 47 public int TimeOutms;
48 public EventType Type;
49
50 public enum EventType : int
51 {
52 Normal = 0,
53 LslHttp = 1
54 }
48 55
49 public PollServiceEventArgs(RequestMethod pRequest, HasEventsMethod pHasEvents, GetEventsMethod pGetEvents, NoEventsMethod pNoEvents, UUID pId, int pTimeOutms) 56 public PollServiceEventArgs(RequestMethod pRequest, HasEventsMethod pHasEvents, GetEventsMethod pGetEvents, NoEventsMethod pNoEvents, UUID pId, int pTimeOutms)
50 { 57 {
@@ -54,6 +61,7 @@ namespace OpenSim.Framework.Servers.HttpServer
54 NoEvents = pNoEvents; 61 NoEvents = pNoEvents;
55 Id = pId; 62 Id = pId;
56 TimeOutms = pTimeOutms; 63 TimeOutms = pTimeOutms;
64 Type = EventType.Normal;
57 } 65 }
58 } 66 }
59} 67}