diff options
author | UbitUmarov | 2018-11-26 16:45:04 +0000 |
---|---|---|
committer | UbitUmarov | 2018-11-26 16:45:04 +0000 |
commit | 87acd20d9546e23c9431c5473bcfdb9fab8e4ca2 (patch) | |
tree | b5927bc3f27816f723cf782b6b2209bb0cb26cc1 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime | |
parent | a fix to contributors list (diff) | |
download | opensim-SC-87acd20d9546e23c9431c5473bcfdb9fab8e4ca2.zip opensim-SC-87acd20d9546e23c9431c5473bcfdb9fab8e4ca2.tar.gz opensim-SC-87acd20d9546e23c9431c5473bcfdb9fab8e4ca2.tar.bz2 opensim-SC-87acd20d9546e23c9431c5473bcfdb9fab8e4ca2.tar.xz |
add script constant OS_APIVERSION, we should inc this on any change on any api. a few changes to os npc and avatar animation functions
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs index 169a0f2..0dbc6c6 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | |||
@@ -29,13 +29,14 @@ using System; | |||
29 | using vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3; | 29 | using vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3; |
30 | using rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion; | 30 | using rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion; |
31 | using LSLInteger = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger; | 31 | using LSLInteger = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger; |
32 | using LSLString = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; | ||
33 | 32 | ||
34 | namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | 33 | namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase |
35 | { | 34 | { |
36 | public partial class ScriptBaseClass | 35 | public partial class ScriptBaseClass |
37 | { | 36 | { |
38 | // SCRIPTS CONSTANTS | 37 | // SCRIPTS CONSTANTS |
38 | public static readonly LSLInteger OS_APIVERSION = 1; | ||
39 | |||
39 | public static readonly LSLInteger TRUE = 1; | 40 | public static readonly LSLInteger TRUE = 1; |
40 | public static readonly LSLInteger FALSE = 0; | 41 | public static readonly LSLInteger FALSE = 0; |
41 | 42 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index 29ada83..ed83894 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
@@ -289,12 +289,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
289 | 289 | ||
290 | // Animation Functions | 290 | // Animation Functions |
291 | 291 | ||
292 | public void osAvatarPlayAnimation(string avatar, string animation) | 292 | public void osAvatarPlayAnimation(LSL_Key avatar, string animation) |
293 | { | 293 | { |
294 | m_OSSL_Functions.osAvatarPlayAnimation(avatar, animation); | 294 | m_OSSL_Functions.osAvatarPlayAnimation(avatar, animation); |
295 | } | 295 | } |
296 | 296 | ||
297 | public void osAvatarStopAnimation(string avatar, string animation) | 297 | public void osAvatarStopAnimation(LSL_Key avatar, string animation) |
298 | { | 298 | { |
299 | m_OSSL_Functions.osAvatarStopAnimation(avatar, animation); | 299 | m_OSSL_Functions.osAvatarStopAnimation(avatar, animation); |
300 | } | 300 | } |