diff options
| author | Melanie | 2012-03-04 16:23:46 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-04 16:23:46 +0000 |
| commit | 182f5efbe94881c22af82bc71566c49dd02ed8f8 (patch) | |
| tree | 2b26c2657cfb91464008d8e305566500bc3cdd9e /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Zero velocity when drag-copying (diff) | |
| download | opensim-SC_OLD-182f5efbe94881c22af82bc71566c49dd02ed8f8.zip opensim-SC_OLD-182f5efbe94881c22af82bc71566c49dd02ed8f8.tar.gz opensim-SC_OLD-182f5efbe94881c22af82bc71566c49dd02ed8f8.tar.bz2 opensim-SC_OLD-182f5efbe94881c22af82bc71566c49dd02ed8f8.tar.xz | |
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 4324cc0..e675c73 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -2411,6 +2411,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2411 | 2411 | ||
| 2412 | if (newPosition != Vector3.Zero) | 2412 | if (newPosition != Vector3.Zero) |
| 2413 | newObject.RootPart.GroupPosition = newPosition; | 2413 | newObject.RootPart.GroupPosition = newPosition; |
| 2414 | if (newObject.RootPart.KeyframeMotion != null) | ||
| 2415 | newObject.RootPart.KeyframeMotion.UpdateSceneObject(newObject); | ||
| 2414 | 2416 | ||
| 2415 | if (!AddSceneObject(newObject)) | 2417 | if (!AddSceneObject(newObject)) |
| 2416 | { | 2418 | { |