aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
diff options
context:
space:
mode:
authorDiva Canto2013-07-17 15:05:36 -0700
committerDiva Canto2013-07-17 15:05:36 -0700
commitfa2370b32ee57a07f27501152c3c705a883b13d8 (patch)
tree229303841ec7a044c3724e64a352d1d26505eb5c /OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
parentRevert "Didn't mean to commit this change in BlockingQueue.cs" (diff)
downloadopensim-SC_OLD-fa2370b32ee57a07f27501152c3c705a883b13d8.zip
opensim-SC_OLD-fa2370b32ee57a07f27501152c3c705a883b13d8.tar.gz
opensim-SC_OLD-fa2370b32ee57a07f27501152c3c705a883b13d8.tar.bz2
opensim-SC_OLD-fa2370b32ee57a07f27501152c3c705a883b13d8.tar.xz
Revert "Cleared up much confusion in PollServiceRequestManager. Here's the history:"
This reverts commit e46459ef21e1ee5ceaeca70365a7c881d33b09ce.
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
index 9477100..020bfd5 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Framework.Servers.HttpServer
50 50
51 public enum EventType : int 51 public enum EventType : int
52 { 52 {
53 LongPoll = 0, 53 Normal = 0,
54 LslHttp = 1, 54 LslHttp = 1,
55 Inventory = 2 55 Inventory = 2
56 } 56 }
@@ -80,7 +80,7 @@ namespace OpenSim.Framework.Servers.HttpServer
80 NoEvents = pNoEvents; 80 NoEvents = pNoEvents;
81 Id = pId; 81 Id = pId;
82 TimeOutms = pTimeOutms; 82 TimeOutms = pTimeOutms;
83 Type = EventType.LongPoll; 83 Type = EventType.Normal;
84 } 84 }
85 } 85 }
86} 86}