From a8901a40f4526720f68049706cabd34cf9717172 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 31 Dec 2009 09:25:16 -0800
Subject: Simulation handlers (agents & objects) completed.

---
 OpenSim/Region/Framework/Scenes/Scene.cs     | 10 ++++++++++
 OpenSim/Region/Framework/Scenes/SceneBase.cs | 11 +++++++++++
 2 files changed, 21 insertions(+)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 0e1e2be..7db99e1 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4889,5 +4889,15 @@ namespace OpenSim.Region.Framework.Scenes
             if (Util.EnvironmentTickCountSubtract(m_lastUpdate) > 2000)
                 StartTimer();
         }
+
+        public override ISceneObject DeserializeObject(string representation)
+        {
+            return SceneObjectSerializer.FromXml2Format(representation);
+        }
+
+        public override bool AllowScriptCrossings
+        {
+            get { return m_allowScriptCrossings; }
+        }
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index 1547f9a..19eea1e 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -510,5 +510,16 @@ namespace OpenSim.Region.Framework.Scenes
 
             MainConsole.Instance.Commands.AddCommand(modulename, shared, command, shorthelp, longhelp, callback);
         }
+
+        public virtual ISceneObject DeserializeObject(string representation)
+        {
+            return null;
+        }
+
+        public virtual bool AllowScriptCrossings
+        {
+            get { return false; }
+        }
+
     }
 }
-- 
cgit v1.1