diff options
| author | Melanie | 2012-08-29 11:46:57 +0200 |
|---|---|---|
| committer | Melanie | 2012-08-29 11:46:57 +0200 |
| commit | f7a60261e9f987ac5c1a1666a2a8ebef2f13c33d (patch) | |
| tree | 32cb53e053ade4561ab1ab867bb4f9803d99ca4a /OpenSim/Region/ScriptEngine | |
| parent | Make llCollisionSprite not throw anymore (diff) | |
| parent | Fix issue with the quit packet being stuck int he queue and a one packet delay. (diff) | |
| download | opensim-SC-f7a60261e9f987ac5c1a1666a2a8ebef2f13c33d.zip opensim-SC-f7a60261e9f987ac5c1a1666a2a8ebef2f13c33d.tar.gz opensim-SC-f7a60261e9f987ac5c1a1666a2a8ebef2f13c33d.tar.bz2 opensim-SC-f7a60261e9f987ac5c1a1666a2a8ebef2f13c33d.tar.xz | |
Merge branch 'ubitwork' into avination
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -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 5830eff..7dae53a 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -12964,7 +12964,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 12964 | if (frames.Data.Length > 0) // We are getting a new motion | 12964 | if (frames.Data.Length > 0) // We are getting a new motion |
| 12965 | { | 12965 | { |
| 12966 | if (group.RootPart.KeyframeMotion != null) | 12966 | if (group.RootPart.KeyframeMotion != null) |
| 12967 | group.RootPart.KeyframeMotion.Stop(); | 12967 | group.RootPart.KeyframeMotion.Delete(); |
| 12968 | group.RootPart.KeyframeMotion = null; | 12968 | group.RootPart.KeyframeMotion = null; |
| 12969 | 12969 | ||
| 12970 | int idx = 0; | 12970 | int idx = 0; |