From b529750548b74ae16c5b2e0f5393e2ef87626d50 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Thu, 9 Apr 2009 11:09:24 +0000
Subject: * Moves Name, GlobalID and WorldPosition into new IEntity interface.
 * Avatar and Object now inherit from IEntity. * Avatar.Position is now
 Avatar.WorldPosition to match IObject property. * Implements event
 World.OnChat += delegate(IWorld sender, ChatEventArgs e);

---
 .../OptionalModules/Scripting/Minimodule/IObject.cs    | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

(limited to 'OpenSim/Region/OptionalModules/Scripting/Minimodule/IObject.cs')

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/IObject.cs
index fd62328..dc2e3fa 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IObject.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/IObject.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
 
     public delegate void OnTouchDelegate(IObject sender, TouchEventArgs e);
 
-    public interface IObject
+    public interface IObject : IEntity
     {
         #region Events
 
@@ -92,17 +92,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
         uint LocalID { get; }
 
         /// <summary>
-        /// The global 'world-unique' ID for this object. 
-        /// (Note, may not actually be world unique)
-        /// </summary>
-        UUID GlobalID { get; }
-
-        /// <summary>
-        /// The name of this Object.
-        /// </summary>
-        String Name { get; set; }
-
-        /// <summary>
         /// The description assigned to this object.
         /// </summary>
         String Description { get; set; }
@@ -141,11 +130,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
         Quaternion OffsetRotation { get; set; }
 
         /// <summary>
-        /// The position of the object relative to the Scene
-        /// </summary>
-        Vector3 WorldPosition { get; set; }
-
-        /// <summary>
         /// The position of the object relative to a parent object
         /// If root, works the same as WorldPosition
         /// </summary>
-- 
cgit v1.1