From 59cd0a2419266f190375074e2bede0d9a10de370 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 11 Jul 2012 23:32:12 +0200
Subject: Change order of operations on backup to ensure keyframe motions are
 backed up properly

---
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 96eeec4..1734ab7 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2039,8 +2039,6 @@ namespace OpenSim.Region.Framework.Scenes
                         HasGroupChangedDueToDelink = false;
 
                         m_scene.EventManager.TriggerOnSceneObjectPreSave(backup_group, this);
-                        datastore.StoreObject(backup_group, m_scene.RegionInfo.RegionID);
-
                         backup_group.ForEachPart(delegate(SceneObjectPart part) 
                         { 
                             if (part.KeyframeMotion != null)
@@ -2048,6 +2046,12 @@ namespace OpenSim.Region.Framework.Scenes
                                 part.KeyframeMotion = KeyframeMotion.FromData(backup_group, part.KeyframeMotion.Serialize());
                                 part.KeyframeMotion.UpdateSceneObject(this);
                             }
+                        });
+
+                        datastore.StoreObject(backup_group, m_scene.RegionInfo.RegionID);
+
+                        backup_group.ForEachPart(delegate(SceneObjectPart part) 
+                        { 
                             part.Inventory.ProcessInventoryBackup(datastore); 
                         });
 
-- 
cgit v1.1