diff options
| author | Melanie | 2012-11-20 00:48:13 +0100 |
|---|---|---|
| committer | Melanie | 2012-11-20 00:48:13 +0100 |
| commit | 0bf66434bc87694c7a19b899afd9b068c67f3bec (patch) | |
| tree | 5c373252d92103dbd7c8376ef8ebd5e7ff8cecc9 /OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs | |
| parent | Prevent a buffer overflow in asset receiving (diff) | |
| parent | * Plumbing and basic setting of the GetMesh Cap Throttler. (diff) | |
| download | opensim-SC-0bf66434bc87694c7a19b899afd9b068c67f3bec.zip opensim-SC-0bf66434bc87694c7a19b899afd9b068c67f3bec.tar.gz opensim-SC-0bf66434bc87694c7a19b899afd9b068c67f3bec.tar.bz2 opensim-SC-0bf66434bc87694c7a19b899afd9b068c67f3bec.tar.xz | |
Merge branch 'teravuswork' into avination
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs index d0a37d0..c19ac32 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs | |||
| @@ -53,7 +53,8 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 53 | Normal = 0, | 53 | Normal = 0, |
| 54 | LslHttp = 1, | 54 | LslHttp = 1, |
| 55 | Inventory = 2, | 55 | Inventory = 2, |
| 56 | Texture = 3 | 56 | Texture = 3, |
| 57 | Mesh = 4 | ||
| 57 | } | 58 | } |
| 58 | 59 | ||
| 59 | public PollServiceEventArgs( | 60 | public PollServiceEventArgs( |