diff options
| author | Robert Adams | 2013-01-17 14:51:52 -0800 |
|---|---|---|
| committer | Robert Adams | 2013-01-17 14:51:52 -0800 |
| commit | a6afd2f706c6a99668faa0af8c75c5836c1e79d9 (patch) | |
| tree | c0265f0e526a8aed9b05006cbc2b3e6dcb4afdaf /OpenSim/Framework | |
| parent | BulletSim: Add one function that all actors who act on the physical (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-a6afd2f706c6a99668faa0af8c75c5836c1e79d9.zip opensim-SC_OLD-a6afd2f706c6a99668faa0af8c75c5836c1e79d9.tar.gz opensim-SC_OLD-a6afd2f706c6a99668faa0af8c75c5836c1e79d9.tar.bz2 opensim-SC_OLD-a6afd2f706c6a99668faa0af8c75c5836c1e79d9.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/ThrottleOutPacketType.cs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/OpenSim/Framework/ThrottleOutPacketType.cs b/OpenSim/Framework/ThrottleOutPacketType.cs index d56231a..ca4b126 100644 --- a/OpenSim/Framework/ThrottleOutPacketType.cs +++ b/OpenSim/Framework/ThrottleOutPacketType.cs | |||
| @@ -47,9 +47,6 @@ namespace OpenSim.Framework | |||
| 47 | Texture = 5, | 47 | Texture = 5, |
| 48 | /// <summary>Non-texture assets</summary> | 48 | /// <summary>Non-texture assets</summary> |
| 49 | Asset = 6, | 49 | Asset = 6, |
| 50 | /// <summary>Avatar and primitive data</summary> | ||
| 51 | /// <remarks>This is a sub-category of Task</remarks> | ||
| 52 | State = 7, | ||
| 53 | } | 50 | } |
| 54 | 51 | ||
| 55 | [Flags] | 52 | [Flags] |
| @@ -61,6 +58,5 @@ namespace OpenSim.Framework | |||
| 61 | Task = 1 << 3, | 58 | Task = 1 << 3, |
| 62 | Texture = 1 << 4, | 59 | Texture = 1 << 4, |
| 63 | Asset = 1 << 5, | 60 | Asset = 1 << 5, |
| 64 | State = 1 << 6, | ||
| 65 | } | 61 | } |
| 66 | } | 62 | } |