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/SceneObjectPart.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/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 0728042..ea3d716 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -315,6 +315,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
315 | 315 | ||
316 | private SOPVehicle m_vehicle = null; | 316 | private SOPVehicle m_vehicle = null; |
317 | 317 | ||
318 | private KeyframeMotion m_keyframeMotion = null; | ||
319 | |||
320 | public KeyframeMotion KeyframeMotion | ||
321 | { | ||
322 | get; set; | ||
323 | } | ||
324 | |||
325 | |||
318 | #endregion Fields | 326 | #endregion Fields |
319 | 327 | ||
320 | // ~SceneObjectPart() | 328 | // ~SceneObjectPart() |
@@ -1924,9 +1932,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1924 | { | 1932 | { |
1925 | if (UsePhysics) | 1933 | if (UsePhysics) |
1926 | { | 1934 | { |
1927 | if (ParentGroup.KeyframeMotion != null) | 1935 | if (ParentGroup.RootPart.KeyframeMotion != null) |
1928 | ParentGroup.KeyframeMotion.Stop(); | 1936 | ParentGroup.RootPart.KeyframeMotion.Stop(); |
1929 | ParentGroup.KeyframeMotion = null; | 1937 | ParentGroup.RootPart.KeyframeMotion = null; |
1930 | ParentGroup.Scene.AddPhysicalPrim(1); | 1938 | ParentGroup.Scene.AddPhysicalPrim(1); |
1931 | 1939 | ||
1932 | PhysActor.OnRequestTerseUpdate += PhysicsRequestingTerseUpdate; | 1940 | PhysActor.OnRequestTerseUpdate += PhysicsRequestingTerseUpdate; |