diff options
| author | ubit | 2012-08-25 16:33:29 +0200 |
|---|---|---|
| committer | ubit | 2012-08-25 16:33:29 +0200 |
| commit | 7a4dba2fdc4b2f33921cc931a7102abd25600927 (patch) | |
| tree | 873d526493b8278a255173923a3c228bb228eeb4 /OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs | |
| parent | try fixing building.. (diff) | |
| parent | Merge branch 'avination' into ubitwork (diff) | |
| download | opensim-SC_OLD-7a4dba2fdc4b2f33921cc931a7102abd25600927.zip opensim-SC_OLD-7a4dba2fdc4b2f33921cc931a7102abd25600927.tar.gz opensim-SC_OLD-7a4dba2fdc4b2f33921cc931a7102abd25600927.tar.bz2 opensim-SC_OLD-7a4dba2fdc4b2f33921cc931a7102abd25600927.tar.xz | |
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to '')
| -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 bb43cd2..c24a000 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs | |||
| @@ -51,7 +51,8 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 51 | public enum EventType : int | 51 | public enum EventType : int |
| 52 | { | 52 | { |
| 53 | Normal = 0, | 53 | Normal = 0, |
| 54 | LslHttp = 1 | 54 | LslHttp = 1, |
| 55 | Inventory = 2 | ||
| 55 | } | 56 | } |
| 56 | 57 | ||
| 57 | public PollServiceEventArgs( | 58 | public PollServiceEventArgs( |