aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
diff options
context:
space:
mode:
authorDiva Canto2013-07-18 12:23:27 -0700
committerDiva Canto2013-07-18 12:23:27 -0700
commit9e35b069a43942285214ff485c8f5ffb53e7c5ec (patch)
tree7f58d5277f530be8e1286c856d5aecef80126f9e /OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
parentMerge branch 'master' of git://opensimulator.org/git/opensim (diff)
downloadopensim-SC_OLD-9e35b069a43942285214ff485c8f5ffb53e7c5ec.zip
opensim-SC_OLD-9e35b069a43942285214ff485c8f5ffb53e7c5ec.tar.gz
opensim-SC_OLD-9e35b069a43942285214ff485c8f5ffb53e7c5ec.tar.bz2
opensim-SC_OLD-9e35b069a43942285214ff485c8f5ffb53e7c5ec.tar.xz
Reverting the reverts I did yesterday. cpu-branch has now been
successfully tested, and I'm merging back those changes, which proved to be good. Revert "Revert "Cleared up much confusion in PollServiceRequestManager. Here's the history:"" This reverts commit fa2370b32ee57a07f27501152c3c705a883b13d8.
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 020bfd5..9477100 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 Normal = 0, 53 LongPoll = 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.Normal; 83 Type = EventType.LongPoll;
84 } 84 }
85 } 85 }
86} 86}