* Apply http://opensimulator.org/mantis/view.php?id=2633 to stable branch

* This stops object persistence at shutdown persisting objects that should not be saved.
* Thanks idb.

OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs

@@ -1192,6 +1192,9 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="datastore"></param>
         public void ProcessBackup(IRegionDataStore datastore)
         {
+            if (!m_isBackedUp)
+                return;
+
             // Since this is the top of the section of call stack for backing up a particular scene object, don't let
             // any exception propogate upwards.