diff options
author | Melanie | 2012-02-26 18:11:38 +0100 |
---|---|---|
committer | Melanie | 2012-02-26 18:11:38 +0100 |
commit | fca8c82232a42191270cb8d18dba6b54d382a2c2 (patch) | |
tree | 0a5b5e3e7d7034b7fd4e620fc0d21ec7c9f5abcb /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |
parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff) | |
download | opensim-SC-fca8c82232a42191270cb8d18dba6b54d382a2c2.zip opensim-SC-fca8c82232a42191270cb8d18dba6b54d382a2c2.tar.gz opensim-SC-fca8c82232a42191270cb8d18dba6b54d382a2c2.tar.bz2 opensim-SC-fca8c82232a42191270cb8d18dba6b54d382a2c2.tar.xz |
Move KeyframeMotion from SOG to SOP because we can't persist it any
other way because SOG doesn't technically exist in the DB
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index e4ab14f..e9f9c2d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -11908,9 +11908,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11908 | 11908 | ||
11909 | if (frames.Data.Length > 0) // We are getting a new motion | 11909 | if (frames.Data.Length > 0) // We are getting a new motion |
11910 | { | 11910 | { |
11911 | if (group.KeyframeMotion != null) | 11911 | if (group.RootPart.KeyframeMotion != null) |
11912 | group.KeyframeMotion.Stop(); | 11912 | group.RootPart.KeyframeMotion.Stop(); |
11913 | group.KeyframeMotion = null; | 11913 | group.RootPart.KeyframeMotion = null; |
11914 | 11914 | ||
11915 | int idx = 0; | 11915 | int idx = 0; |
11916 | 11916 | ||
@@ -11953,7 +11953,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11953 | } | 11953 | } |
11954 | } | 11954 | } |
11955 | 11955 | ||
11956 | group.KeyframeMotion = new KeyframeMotion(group, mode, data); | 11956 | group.RootPart.KeyframeMotion = new KeyframeMotion(group, mode, data); |
11957 | 11957 | ||
11958 | idx = 0; | 11958 | idx = 0; |
11959 | 11959 | ||
@@ -11990,17 +11990,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11990 | keyframes.Add(frame); | 11990 | keyframes.Add(frame); |
11991 | } | 11991 | } |
11992 | 11992 | ||
11993 | group.KeyframeMotion.SetKeyframes(keyframes.ToArray()); | 11993 | group.RootPart.KeyframeMotion.SetKeyframes(keyframes.ToArray()); |
11994 | group.KeyframeMotion.Start(); | 11994 | group.RootPart.KeyframeMotion.Start(); |
11995 | } | 11995 | } |
11996 | else | 11996 | else |
11997 | { | 11997 | { |
11998 | if (group.KeyframeMotion == null) | 11998 | if (group.RootPart.KeyframeMotion == null) |
11999 | return; | 11999 | return; |
12000 | 12000 | ||
12001 | if (options.Data.Length == 0) | 12001 | if (options.Data.Length == 0) |
12002 | { | 12002 | { |
12003 | group.KeyframeMotion.Stop(); | 12003 | group.RootPart.KeyframeMotion.Stop(); |
12004 | return; | 12004 | return; |
12005 | } | 12005 | } |
12006 | 12006 | ||
@@ -12020,13 +12020,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
12020 | switch (cmd) | 12020 | switch (cmd) |
12021 | { | 12021 | { |
12022 | case ScriptBaseClass.KFM_CMD_PLAY: | 12022 | case ScriptBaseClass.KFM_CMD_PLAY: |
12023 | group.KeyframeMotion.Start(); | 12023 | group.RootPart.KeyframeMotion.Start(); |
12024 | break; | 12024 | break; |
12025 | case ScriptBaseClass.KFM_CMD_STOP: | 12025 | case ScriptBaseClass.KFM_CMD_STOP: |
12026 | group.KeyframeMotion.Stop(); | 12026 | group.RootPart.KeyframeMotion.Stop(); |
12027 | break; | 12027 | break; |
12028 | case ScriptBaseClass.KFM_CMD_PAUSE: | 12028 | case ScriptBaseClass.KFM_CMD_PAUSE: |
12029 | group.KeyframeMotion.Pause(); | 12029 | group.RootPart.KeyframeMotion.Pause(); |
12030 | break; | 12030 | break; |
12031 | } | 12031 | } |
12032 | break; | 12032 | break; |