* This fixes having to select and deselect prim to get keyframemotion to start running when pulled from data storage.
Conflicts: OpenSim/Data/SQLite/SQLiteSimulationData.csavinationmerge
parent
a4a4898a0e
commit
689969e143
|
@ -458,8 +458,6 @@ namespace OpenSim.Data.MySQL
|
|||
if (prim.ParentUUID == UUID.Zero)
|
||||
{
|
||||
objects[prim.UUID] = new SceneObjectGroup(prim);
|
||||
if (prim.KeyframeMotion != null)
|
||||
prim.KeyframeMotion.UpdateSceneObject(objects[prim.UUID]);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -732,9 +732,12 @@ namespace OpenSim.Data.SQLite
|
|||
}
|
||||
|
||||
SceneObjectGroup group = new SceneObjectGroup(prim);
|
||||
|
||||
createdObjects.Add(group.UUID, group);
|
||||
retvals.Add(group);
|
||||
LoadItems(prim);
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
|
|
|
@ -1072,6 +1072,11 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
for (int i = 0; i < parts.Length; i++)
|
||||
{
|
||||
SceneObjectPart part = parts[i];
|
||||
if (part.KeyframeMotion != null)
|
||||
{
|
||||
part.KeyframeMotion.UpdateSceneObject(this);
|
||||
}
|
||||
|
||||
if (Object.ReferenceEquals(part, m_rootPart))
|
||||
continue;
|
||||
|
||||
|
|
Loading…
Reference in New Issue