diff options
| author | Melanie | 2012-11-20 01:20:59 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-20 01:20:59 +0000 |
| commit | ccc81183b042a62752b7be4b16e0ccc7dbd03b3f (patch) | |
| tree | e556eb6a576393799aa5eaa38afb35e0d64785ed /OpenSim/Framework | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | * Fixes mesh loading issues in last commit. (diff) | |
| download | opensim-SC_OLD-ccc81183b042a62752b7be4b16e0ccc7dbd03b3f.zip opensim-SC_OLD-ccc81183b042a62752b7be4b16e0ccc7dbd03b3f.tar.gz opensim-SC_OLD-ccc81183b042a62752b7be4b16e0ccc7dbd03b3f.tar.bz2 opensim-SC_OLD-ccc81183b042a62752b7be4b16e0ccc7dbd03b3f.tar.xz | |
Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
Diffstat (limited to 'OpenSim/Framework')
| -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( |