diff options
| author | Melanie | 2011-11-28 11:06:38 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-28 11:06:38 +0000 |
| commit | dc612d0f08ff8740c1942270f22eb79f0310c8fd (patch) | |
| tree | 4c621d499eecbc176c6eb28a4bad4f8f4872e7f5 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-dc612d0f08ff8740c1942270f22eb79f0310c8fd.zip opensim-SC-dc612d0f08ff8740c1942270f22eb79f0310c8fd.tar.gz opensim-SC-dc612d0f08ff8740c1942270f22eb79f0310c8fd.tar.bz2 opensim-SC-dc612d0f08ff8740c1942270f22eb79f0310c8fd.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs index a1cf3df..0ad3f78 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | |||
| @@ -323,6 +323,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
| 323 | public const int PRIM_DESC = 28; | 323 | public const int PRIM_DESC = 28; |
| 324 | public const int PRIM_ROT_LOCAL = 29; | 324 | public const int PRIM_ROT_LOCAL = 29; |
| 325 | public const int PRIM_OMEGA = 32; | 325 | public const int PRIM_OMEGA = 32; |
| 326 | public const int PRIM_POS_LOCAL = 33; | ||
| 326 | public const int PRIM_LINK_TARGET = 34; | 327 | public const int PRIM_LINK_TARGET = 34; |
| 327 | public const int PRIM_TEXGEN_DEFAULT = 0; | 328 | public const int PRIM_TEXGEN_DEFAULT = 0; |
| 328 | public const int PRIM_TEXGEN_PLANAR = 1; | 329 | public const int PRIM_TEXGEN_PLANAR = 1; |