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/Framework/Scenes/Scene.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/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index c20da4b..11a41aa 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -2421,8 +2421,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2421 | 2421 | ||
| 2422 | if (newPosition != Vector3.Zero) | 2422 | if (newPosition != Vector3.Zero) |
| 2423 | newObject.RootPart.GroupPosition = newPosition; | 2423 | newObject.RootPart.GroupPosition = newPosition; |
| 2424 | if (newObject.KeyframeMotion != null) | 2424 | if (newObject.RootPart.KeyframeMotion != null) |
| 2425 | newObject.KeyframeMotion.UpdateSceneObject(newObject); | 2425 | newObject.RootPart.KeyframeMotion.UpdateSceneObject(newObject); |
| 2426 | 2426 | ||
| 2427 | if (!AddSceneObject(newObject)) | 2427 | if (!AddSceneObject(newObject)) |
| 2428 | { | 2428 | { |