Merge branch 'master' into careminster

This commit is contained in:
Melanie
2013-06-13 02:49:43 +01:00
18 changed files with 294 additions and 189 deletions

View File

@@ -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]);
}
}