diff options
| author | lbsa71 | 2007-12-07 13:49:33 +0000 |
|---|---|---|
| committer | lbsa71 | 2007-12-07 13:49:33 +0000 |
| commit | 9414d6a1e191a77c39d84fb3f301ba5304a9c29a (patch) | |
| tree | 206472bbaf3a242d06c78ae2db58be891d5dbd1a /OpenSim | |
| parent | updated libopenjpeg-libsl-2.1.2.0.dylib (diff) | |
| download | opensim-SC_OLD-9414d6a1e191a77c39d84fb3f301ba5304a9c29a.zip opensim-SC_OLD-9414d6a1e191a77c39d84fb3f301ba5304a9c29a.tar.gz opensim-SC_OLD-9414d6a1e191a77c39d84fb3f301ba5304a9c29a.tar.bz2 opensim-SC_OLD-9414d6a1e191a77c39d84fb3f301ba5304a9c29a.tar.xz | |
* miniscule changes just to keep myself in synch
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/PrimitiveBaseShape.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs index 5cdbfb2..a9da7c8 100644 --- a/OpenSim/Framework/PrimitiveBaseShape.cs +++ b/OpenSim/Framework/PrimitiveBaseShape.cs | |||
| @@ -65,7 +65,7 @@ namespace OpenSim.Framework | |||
| 65 | 65 | ||
| 66 | public class PrimitiveBaseShape | 66 | public class PrimitiveBaseShape |
| 67 | { | 67 | { |
| 68 | private static byte[] m_defaultTextureEntry; | 68 | private static readonly byte[] m_defaultTextureEntry; |
| 69 | 69 | ||
| 70 | public byte PCode; | 70 | public byte PCode; |
| 71 | public ushort PathBegin; | 71 | public ushort PathBegin; |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs index f2774d6..1dbbeea 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs | |||
| @@ -2025,7 +2025,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL | |||
| 2025 | public const int REMOTE_DATA_CHANNEL = 1; | 2025 | public const int REMOTE_DATA_CHANNEL = 1; |
| 2026 | public const int REMOTE_DATA_REQUEST = 2; | 2026 | public const int REMOTE_DATA_REQUEST = 2; |
| 2027 | public const int REMOTE_DATA_REPLY = 3; | 2027 | public const int REMOTE_DATA_REPLY = 3; |
| 2028 | //public const int PRIM_TYPE = 1; | 2028 | |
| 2029 | public const int PRIM_MATERIAL = 2; | 2029 | public const int PRIM_MATERIAL = 2; |
| 2030 | public const int PRIM_PHYSICS = 3; | 2030 | public const int PRIM_PHYSICS = 3; |
| 2031 | public const int PRIM_TEMP_ON_REZ = 4; | 2031 | public const int PRIM_TEMP_ON_REZ = 4; |
| @@ -2049,6 +2049,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL | |||
| 2049 | public const int PRIM_TYPE_TORUS = 4; | 2049 | public const int PRIM_TYPE_TORUS = 4; |
| 2050 | public const int PRIM_TYPE_TUBE = 5; | 2050 | public const int PRIM_TYPE_TUBE = 5; |
| 2051 | public const int PRIM_TYPE_RING = 6; | 2051 | public const int PRIM_TYPE_RING = 6; |
| 2052 | public const int PRIM_TYPE_SCULPT = 7; | ||
| 2052 | public const int PRIM_HOLE_DEFAULT = 0; | 2053 | public const int PRIM_HOLE_DEFAULT = 0; |
| 2053 | public const int PRIM_HOLE_CIRCLE = 16; | 2054 | public const int PRIM_HOLE_CIRCLE = 16; |
| 2054 | public const int PRIM_HOLE_SQUARE = 32; | 2055 | public const int PRIM_HOLE_SQUARE = 32; |
| @@ -2083,6 +2084,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL | |||
| 2083 | public const int PRIM_BUMP_STUCCO = 15; | 2084 | public const int PRIM_BUMP_STUCCO = 15; |
| 2084 | public const int PRIM_BUMP_SUCTION = 16; | 2085 | public const int PRIM_BUMP_SUCTION = 16; |
| 2085 | public const int PRIM_BUMP_WEAVE = 17; | 2086 | public const int PRIM_BUMP_WEAVE = 17; |
| 2087 | |||
| 2086 | public const int MASK_BASE = 0; | 2088 | public const int MASK_BASE = 0; |
| 2087 | public const int MASK_OWNER = 1; | 2089 | public const int MASK_OWNER = 1; |
| 2088 | public const int MASK_GROUP = 2; | 2090 | public const int MASK_GROUP = 2; |