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

@@ -732,11 +732,12 @@ namespace OpenSim.Data.SQLite
}
SceneObjectGroup group = new SceneObjectGroup(prim);
if (prim.KeyframeMotion != null)
prim.KeyframeMotion.UpdateSceneObject(group);
createdObjects.Add(group.UUID, group);
retvals.Add(group);
LoadItems(prim);
}
}
catch (Exception e)