From a5800f479e7b784a3b1cbba51fdab0a5b872a9d2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 22 Mar 2014 00:29:13 +0000
Subject: If an object has it's temporary flag unset after being set, put it
 back in the persistence list.

Effectively uses the patch in http://opensimulator.org/mantis/view.php?id=7060
But also adds a regression test and exposes the necessary property to allow this to work.
---
 .../Framework/Scenes/Tests/SceneObjectStatusTests.cs  | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'OpenSim/Region/Framework/Scenes/Tests')

diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs
index 8eb3191..6985766 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs
@@ -58,6 +58,25 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         }
 
         [Test]
+        public void TestSetTemporary()
+        {
+            TestHelpers.InMethod();
+
+            m_scene.AddSceneObject(m_so1);
+            m_so1.ScriptSetTemporaryStatus(true);
+
+            // Is this really the correct flag?
+            Assert.That(m_so1.RootPart.Flags, Is.EqualTo(PrimFlags.TemporaryOnRez));
+            Assert.That(m_so1.Backup, Is.False);
+
+            // Test setting back to non-temporary
+            m_so1.ScriptSetTemporaryStatus(false);
+
+            Assert.That(m_so1.RootPart.Flags, Is.EqualTo(PrimFlags.None));
+            Assert.That(m_so1.Backup, Is.True);          
+        }
+
+        [Test]
         public void TestSetPhantomSinglePrim()
         {
             TestHelpers.InMethod();
-- 
cgit v1.1