diff options
| author | Melanie | 2011-10-26 17:48:51 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-26 17:48:51 +0100 |
| commit | 6a96c9546d4fd89f6e9319246cc2270836cf19f7 (patch) | |
| tree | e6492419b9a03cb78435e911b345b4a31f749162 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Merge branch 'master' of /home/opensim/var/repo/opensim (diff) | |
| download | opensim-SC-6a96c9546d4fd89f6e9319246cc2270836cf19f7.zip opensim-SC-6a96c9546d4fd89f6e9319246cc2270836cf19f7.tar.gz opensim-SC-6a96c9546d4fd89f6e9319246cc2270836cf19f7.tar.bz2 opensim-SC-6a96c9546d4fd89f6e9319246cc2270836cf19f7.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | 2 |
1 files changed, 2 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 3af9911..a1cf3df 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | |||
| @@ -322,6 +322,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
| 322 | public const int PRIM_NAME = 27; | 322 | public const int PRIM_NAME = 27; |
| 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; | ||
| 326 | public const int PRIM_LINK_TARGET = 34; | ||
| 325 | public const int PRIM_TEXGEN_DEFAULT = 0; | 327 | public const int PRIM_TEXGEN_DEFAULT = 0; |
| 326 | public const int PRIM_TEXGEN_PLANAR = 1; | 328 | public const int PRIM_TEXGEN_PLANAR = 1; |
| 327 | 329 | ||