From cdd1285e9ef2af6196d53941efcad4626624cabc Mon Sep 17 00:00:00 2001
From: MW
Date: Wed, 1 Aug 2007 18:04:31 +0000
Subject: few small changes. Updated libsl to latest version.

---
 .../Environment/Scenes/AllNewSceneObjectPart2.cs   | 17 +++++++++++++++++
 OpenSim/Region/Environment/Scenes/EntityBase.cs    | 22 ++++++++++++++--------
 OpenSim/Region/Environment/Scenes/Primitive.cs     |  2 ++
 3 files changed, 33 insertions(+), 8 deletions(-)

(limited to 'OpenSim/Region/Environment')

diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
index 8a995e0..cf511ae 100644
--- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
+++ b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
@@ -87,6 +87,19 @@ namespace OpenSim.Region.Environment.Scenes
             }
         }
 
+        protected LLObject.MaterialType m_material;
+        public byte Material
+        {
+            get
+            {
+                return (byte)m_material;
+            }
+            set
+            {
+                m_material = (LLObject.MaterialType) value;
+            }
+        }
+
         protected ulong m_regionHandle;
         public ulong RegionHandle
         {
@@ -187,6 +200,10 @@ namespace OpenSim.Region.Environment.Scenes
             {
                 return this.m_Shape;
             }
+            set
+            {
+                m_Shape = value;
+            }
         }
 
         public LLVector3 Scale
diff --git a/OpenSim/Region/Environment/Scenes/EntityBase.cs b/OpenSim/Region/Environment/Scenes/EntityBase.cs
index 08f13c2..fa0fc33 100644
--- a/OpenSim/Region/Environment/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Environment/Scenes/EntityBase.cs
@@ -6,14 +6,24 @@ namespace OpenSim.Region.Environment.Scenes
 {
     public abstract class EntityBase
     {
-        public LLUUID m_uuid;
-
         protected List<EntityBase> m_children;
 
-
         protected Scene m_scene;
-        protected string m_name;
 
+        public LLUUID m_uuid;
+        public LLUUID UUID
+        {
+            get
+            {
+                return m_uuid;
+            }
+            set
+            {
+                m_uuid = value;
+            }
+        }
+
+        protected string m_name;
         /// <summary>
         /// 
         /// </summary>
@@ -24,7 +34,6 @@ namespace OpenSim.Region.Environment.Scenes
         }
 
         protected LLVector3 m_pos;
-
         /// <summary>
         /// 
         /// </summary>
@@ -35,7 +44,6 @@ namespace OpenSim.Region.Environment.Scenes
         }
 
         public LLVector3 m_velocity;
-
         /// <summary>
         /// 
         /// </summary>
@@ -46,7 +54,6 @@ namespace OpenSim.Region.Environment.Scenes
         }
 
         protected Quaternion m_rotation = new Quaternion(0, 0, 1, 0);
-
         public virtual Quaternion Rotation
         {
             get { return m_rotation; }
@@ -54,7 +61,6 @@ namespace OpenSim.Region.Environment.Scenes
         }
 
         protected uint m_localId;
-
         public uint LocalId
         {
             get { return m_localId; }
diff --git a/OpenSim/Region/Environment/Scenes/Primitive.cs b/OpenSim/Region/Environment/Scenes/Primitive.cs
index 3d3e25a..f36f555 100644
--- a/OpenSim/Region/Environment/Scenes/Primitive.cs
+++ b/OpenSim/Region/Environment/Scenes/Primitive.cs
@@ -9,6 +9,8 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Inventory;
 using OpenSim.Framework.Types;
 
+using InventoryItem = OpenSim.Framework.Inventory.InventoryItem;
+
 namespace OpenSim.Region.Environment.Scenes
 {
     public delegate void PrimCountTaintedDelegate();
-- 
cgit v1.1