From 6181191a037fd8481cff640405685d9a46ba89a3 Mon Sep 17 00:00:00 2001
From: MW
Date: Mon, 27 Aug 2007 11:18:50 +0000
Subject: Stopped EntityBase from implementing IScriptHost, as don't think it
 should, multiple objects are based on entitybase and they all don't want the
 baggage from IScriptHost. SceneObjectPart already implements it anyway. Added
 llGetOwner function, and tested the ll functions that I added in last commit.

---
 OpenSim/Region/Environment/Scenes/EntityBase.cs               | 2 +-
 OpenSim/Region/Environment/Scenes/SceneObjectPart.cs          | 5 +++++
 OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs    | 1 +
 OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs | 3 +++
 4 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Environment')

diff --git a/OpenSim/Region/Environment/Scenes/EntityBase.cs b/OpenSim/Region/Environment/Scenes/EntityBase.cs
index 6d933e6..a7b9d75 100644
--- a/OpenSim/Region/Environment/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Environment/Scenes/EntityBase.cs
@@ -5,7 +5,7 @@ using OpenSim.Region.Environment.Scenes.Scripting;
 
 namespace OpenSim.Region.Environment.Scenes
 {
-    public abstract class EntityBase : IScriptHost
+    public abstract class EntityBase 
     {
         protected List<EntityBase> m_children;
 
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index b77da3a..a621632 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -201,6 +201,11 @@ namespace OpenSim.Region.Environment.Scenes
         }
         #endregion
 
+        public LLUUID ObjectOwner
+        {
+            get { return OwnerID; }
+        }
+
         #region Constructors
         /// <summary>
         /// 
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs b/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs
index d2ca529..e7d0570 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs
@@ -9,6 +9,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
     {
         string Name { get; set;}
         LLUUID UUID { get; }
+        LLUUID ObjectOwner { get;}
         LLVector3 AbsolutePosition { get; }
         void SetText(string text, Axiom.Math.Vector3 color, double alpha);
     }
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
index a9147fb1..a50b142 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
@@ -20,6 +20,9 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
             get { return LLUUID.Zero; }
         }
 
+        public LLUUID ObjectOwner
+        { get { return LLUUID.Zero; } }
+
         public LLVector3 AbsolutePosition
         {
             get { return m_pos; }
-- 
cgit v1.1