aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Communications/IInventoryServices.cs1
-rw-r--r--OpenSim/Framework/UserManager/UserManagerBase.cs1
-rw-r--r--OpenSim/Region/ClientStack/Assets/InventoryCache.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs17
-rw-r--r--OpenSim/Region/Environment/Scenes/EntityBase.cs22
-rw-r--r--OpenSim/Region/Environment/Scenes/Primitive.cs2
6 files changed, 37 insertions, 8 deletions
diff --git a/OpenSim/Framework/Communications/IInventoryServices.cs b/OpenSim/Framework/Communications/IInventoryServices.cs
index 807952c..b78cba1 100644
--- a/OpenSim/Framework/Communications/IInventoryServices.cs
+++ b/OpenSim/Framework/Communications/IInventoryServices.cs
@@ -4,6 +4,7 @@ using System.Text;
4using OpenSim.Framework.Data; 4using OpenSim.Framework.Data;
5using libsecondlife; 5using libsecondlife;
6using OpenSim.Framework.Communications.Caches; 6using OpenSim.Framework.Communications.Caches;
7using InventoryFolder = OpenSim.Framework.Communications.Caches.InventoryFolder;
7 8
8namespace OpenSim.Framework.Communications 9namespace OpenSim.Framework.Communications
9{ 10{
diff --git a/OpenSim/Framework/UserManager/UserManagerBase.cs b/OpenSim/Framework/UserManager/UserManagerBase.cs
index 61b5df4..41744bd 100644
--- a/OpenSim/Framework/UserManager/UserManagerBase.cs
+++ b/OpenSim/Framework/UserManager/UserManagerBase.cs
@@ -39,6 +39,7 @@ using OpenSim.Framework.Inventory;
39using OpenSim.Framework.Utilities; 39using OpenSim.Framework.Utilities;
40 40
41using OpenSim.Framework.Configuration; 41using OpenSim.Framework.Configuration;
42using InventoryFolder = OpenSim.Framework.Inventory.InventoryFolder;
42 43
43namespace OpenSim.Framework.UserManagement 44namespace OpenSim.Framework.UserManagement
44{ 45{
diff --git a/OpenSim/Region/ClientStack/Assets/InventoryCache.cs b/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
index 1bb6c07..c0609b6 100644
--- a/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
+++ b/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
@@ -35,6 +35,8 @@ using OpenSim.Framework.Interfaces;
35using OpenSim.Framework.Inventory; 35using OpenSim.Framework.Inventory;
36using OpenSim.Framework.Types; 36using OpenSim.Framework.Types;
37using OpenSim.Region.ClientStack; 37using OpenSim.Region.ClientStack;
38using InventoryFolder = OpenSim.Framework.Inventory.InventoryFolder;
39using InventoryItem = OpenSim.Framework.Inventory.InventoryItem;
38 40
39namespace OpenSim.Assets 41namespace OpenSim.Assets
40{ 42{
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
87 } 87 }
88 } 88 }
89 89
90 protected LLObject.MaterialType m_material;
91 public byte Material
92 {
93 get
94 {
95 return (byte)m_material;
96 }
97 set
98 {
99 m_material = (LLObject.MaterialType) value;
100 }
101 }
102
90 protected ulong m_regionHandle; 103 protected ulong m_regionHandle;
91 public ulong RegionHandle 104 public ulong RegionHandle
92 { 105 {
@@ -187,6 +200,10 @@ namespace OpenSim.Region.Environment.Scenes
187 { 200 {
188 return this.m_Shape; 201 return this.m_Shape;
189 } 202 }
203 set
204 {
205 m_Shape = value;
206 }
190 } 207 }
191 208
192 public LLVector3 Scale 209 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
6{ 6{
7 public abstract class EntityBase 7 public abstract class EntityBase
8 { 8 {
9 public LLUUID m_uuid;
10
11 protected List<EntityBase> m_children; 9 protected List<EntityBase> m_children;
12 10
13
14 protected Scene m_scene; 11 protected Scene m_scene;
15 protected string m_name;
16 12
13 public LLUUID m_uuid;
14 public LLUUID UUID
15 {
16 get
17 {
18 return m_uuid;
19 }
20 set
21 {
22 m_uuid = value;
23 }
24 }
25
26 protected string m_name;
17 /// <summary> 27 /// <summary>
18 /// 28 ///
19 /// </summary> 29 /// </summary>
@@ -24,7 +34,6 @@ namespace OpenSim.Region.Environment.Scenes
24 } 34 }
25 35
26 protected LLVector3 m_pos; 36 protected LLVector3 m_pos;
27
28 /// <summary> 37 /// <summary>
29 /// 38 ///
30 /// </summary> 39 /// </summary>
@@ -35,7 +44,6 @@ namespace OpenSim.Region.Environment.Scenes
35 } 44 }
36 45
37 public LLVector3 m_velocity; 46 public LLVector3 m_velocity;
38
39 /// <summary> 47 /// <summary>
40 /// 48 ///
41 /// </summary> 49 /// </summary>
@@ -46,7 +54,6 @@ namespace OpenSim.Region.Environment.Scenes
46 } 54 }
47 55
48 protected Quaternion m_rotation = new Quaternion(0, 0, 1, 0); 56 protected Quaternion m_rotation = new Quaternion(0, 0, 1, 0);
49
50 public virtual Quaternion Rotation 57 public virtual Quaternion Rotation
51 { 58 {
52 get { return m_rotation; } 59 get { return m_rotation; }
@@ -54,7 +61,6 @@ namespace OpenSim.Region.Environment.Scenes
54 } 61 }
55 62
56 protected uint m_localId; 63 protected uint m_localId;
57
58 public uint LocalId 64 public uint LocalId
59 { 65 {
60 get { return m_localId; } 66 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;
9using OpenSim.Framework.Inventory; 9using OpenSim.Framework.Inventory;
10using OpenSim.Framework.Types; 10using OpenSim.Framework.Types;
11 11
12using InventoryItem = OpenSim.Framework.Inventory.InventoryItem;
13
12namespace OpenSim.Region.Environment.Scenes 14namespace OpenSim.Region.Environment.Scenes
13{ 15{
14 public delegate void PrimCountTaintedDelegate(); 16 public delegate void PrimCountTaintedDelegate();