OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

avinationmerge
ubit 2012-08-30 02:35:31 +02:00
parent f15b690687 a7281003d8
commit e402a24972
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
View File

@ -272,8 +272,6 @@ namespace OpenSim.Region.Framework.Scenes
newmotion.m_basePosition = m_basePosition; newmotion.m_basePosition = m_basePosition;
newmotion.m_baseRotation = m_baseRotation; newmotion.m_baseRotation = m_baseRotation;
newmotion.m_currentFrame = m_currentFrame;
if (m_selected) if (m_selected)
newmotion.m_serializedPosition = m_serializedPosition; newmotion.m_serializedPosition = m_serializedPosition;
else else
@ -284,6 +282,8 @@ namespace OpenSim.Region.Framework.Scenes
newmotion.m_serializedPosition = m_serializedPosition; newmotion.m_serializedPosition = m_serializedPosition;
} }
newmotion.m_currentFrame = m_currentFrame;
newmotion.m_iterations = m_iterations; newmotion.m_iterations = m_iterations;
newmotion.m_running = m_running; newmotion.m_running = m_running;

4
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -2160,6 +2160,7 @@ namespace OpenSim.Region.Framework.Scenes
dupe.CopyRootPart(m_rootPart, OwnerID, GroupID, userExposed); dupe.CopyRootPart(m_rootPart, OwnerID, GroupID, userExposed);
dupe.m_rootPart.LinkNum = m_rootPart.LinkNum; dupe.m_rootPart.LinkNum = m_rootPart.LinkNum;
if (userExposed) if (userExposed)
dupe.m_rootPart.TrimPermissions(); dupe.m_rootPart.TrimPermissions();
@ -2209,6 +2210,9 @@ namespace OpenSim.Region.Framework.Scenes
if (userExposed) if (userExposed)
newPart.ApplyPhysics((uint)newPart.Flags,newPart.VolumeDetectActive,true); newPart.ApplyPhysics((uint)newPart.Flags,newPart.VolumeDetectActive,true);
// } // }
// copy keyframemotion
if (part.KeyframeMotion != null)
newPart.KeyframeMotion = part.KeyframeMotion.Copy(dupe);
} }
if (userExposed) if (userExposed)

4
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -2110,8 +2110,8 @@ namespace OpenSim.Region.Framework.Scenes
Array.Copy(Shape.ExtraParams, extraP, extraP.Length); Array.Copy(Shape.ExtraParams, extraP, extraP.Length);
dupe.Shape.ExtraParams = extraP; dupe.Shape.ExtraParams = extraP;
if (KeyframeMotion != null) // safeguard actual copy is done in sog.copy
dupe.KeyframeMotion = KeyframeMotion.Copy(null); dupe.KeyframeMotion = null;
if (userExposed) if (userExposed)
{ {