diff options
| author | Melanie | 2012-08-29 11:18:32 +0200 |
|---|---|---|
| committer | Melanie | 2012-08-29 11:18:32 +0200 |
| commit | f671e446bfdca5932d45cc358324a667d3239473 (patch) | |
| tree | 05c6a16e9e983a10845b2622f3c4d7091dae5765 /OpenSim/Region/ScriptEngine | |
| parent | Add a queue with two priority levels. This is a drop in replacement for (diff) | |
| parent | A few more changes to keyframes (diff) | |
| download | opensim-SC-f671e446bfdca5932d45cc358324a667d3239473.zip opensim-SC-f671e446bfdca5932d45cc358324a667d3239473.tar.gz opensim-SC-f671e446bfdca5932d45cc358324a667d3239473.tar.bz2 opensim-SC-f671e446bfdca5932d45cc358324a667d3239473.tar.xz | |
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index d8ef772..207d062 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -12963,7 +12963,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 12963 | if (frames.Data.Length > 0) // We are getting a new motion | 12963 | if (frames.Data.Length > 0) // We are getting a new motion |
| 12964 | { | 12964 | { |
| 12965 | if (group.RootPart.KeyframeMotion != null) | 12965 | if (group.RootPart.KeyframeMotion != null) |
| 12966 | group.RootPart.KeyframeMotion.Stop(); | 12966 | group.RootPart.KeyframeMotion.Delete(); |
| 12967 | group.RootPart.KeyframeMotion = null; | 12967 | group.RootPart.KeyframeMotion = null; |
| 12968 | 12968 | ||
| 12969 | int idx = 0; | 12969 | int idx = 0; |