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/SceneBase.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'OpenSim/Region/Framework/Scenes/SceneBase.cs')

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


From c5ea783526611a968400a1936e4c6764ee1c7013 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 11 Jan 2010 07:51:33 -0800
Subject: OpenSim/Framework/Communications/Cache deleted. LibraryRootFolder
 deleted.

---
 OpenSim/Region/Framework/Scenes/SceneBase.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework/Scenes/SceneBase.cs')

diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index 19eea1e..aed8640 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -34,7 +34,7 @@ using log4net;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
-using OpenSim.Framework.Communications.Cache;
+
 using OpenSim.Region.Framework.Interfaces;
 using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
-- 
cgit v1.1


From 052f2b3e275b60777c51ca0274f33abce869c55d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 16 Feb 2010 14:36:08 +0000
Subject: minor: Make SOG.DelinkFromGroup() return the newly delinked scene
 object instead of void

---
 OpenSim/Region/Framework/Scenes/SceneBase.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework/Scenes/SceneBase.cs')

diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index 1547f9a..5e798c0 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -262,7 +262,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// Returns a new unallocated local ID
         /// </summary>
         /// <returns>A brand new local ID</returns>
-        protected internal uint AllocateLocalId()
+        public uint AllocateLocalId()
         {
             uint myID;
 
-- 
cgit v1.1