diff options
| author | Melanie | 2012-08-18 13:17:39 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-18 13:17:39 +0100 |
| commit | aee7a31bc3b5348c883e0d750bab991d853db642 (patch) | |
| tree | 9d38c2ec7cc62019ab3ea95a3716d28e1451c397 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-aee7a31bc3b5348c883e0d750bab991d853db642.zip opensim-SC_OLD-aee7a31bc3b5348c883e0d750bab991d853db642.tar.gz opensim-SC_OLD-aee7a31bc3b5348c883e0d750bab991d853db642.tar.bz2 opensim-SC_OLD-aee7a31bc3b5348c883e0d750bab991d853db642.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.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 f989cc6..05ba222 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | |||
| @@ -329,6 +329,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
| 329 | public const int PRIM_OMEGA = 32; | 329 | public const int PRIM_OMEGA = 32; |
| 330 | public const int PRIM_POS_LOCAL = 33; | 330 | public const int PRIM_POS_LOCAL = 33; |
| 331 | public const int PRIM_LINK_TARGET = 34; | 331 | public const int PRIM_LINK_TARGET = 34; |
| 332 | public const int PRIM_SLICE = 35; | ||
| 332 | public const int PRIM_TEXGEN_DEFAULT = 0; | 333 | public const int PRIM_TEXGEN_DEFAULT = 0; |
| 333 | public const int PRIM_TEXGEN_PLANAR = 1; | 334 | public const int PRIM_TEXGEN_PLANAR = 1; |
| 334 | 335 | ||