aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs109
1 files changed, 99 insertions, 10 deletions
diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
index 07d1357..8a995e0 100644
--- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
+++ b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
@@ -14,21 +14,15 @@ namespace OpenSim.Region.Environment.Scenes
14 { 14 {
15 private const uint FULL_MASK_PERMISSIONS = 2147483647; 15 private const uint FULL_MASK_PERMISSIONS = 2147483647;
16 16
17 private uint m_flags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456 + 128;
18 private ulong m_regionHandle;
19
20 public string SitName = ""; 17 public string SitName = "";
21 public string TouchName = ""; 18 public string TouchName = "";
22 public string Text = ""; 19 public string Text = "";
23 20
24 public LLUUID CreatorID; 21 public LLUUID CreatorID;
25 public LLUUID OwnerID; 22 public LLUUID OwnerID;
23 public LLUUID GroupID;
26 public LLUUID LastOwnerID; 24 public LLUUID LastOwnerID;
27 public Int32 CreationDate; 25 public Int32 CreationDate;
28
29 public LLUUID uuid;
30 public uint m_localID;
31
32 public uint ParentID = 0; 26 public uint ParentID = 0;
33 27
34 public uint OwnerMask = FULL_MASK_PERMISSIONS; 28 public uint OwnerMask = FULL_MASK_PERMISSIONS;
@@ -43,6 +37,33 @@ namespace OpenSim.Region.Environment.Scenes
43 37
44 38
45 #region Properties 39 #region Properties
40
41 protected LLUUID m_uuid;
42 public LLUUID UUID
43 {
44 get
45 {
46 return m_uuid;
47 }
48 set
49 {
50 value = m_uuid;
51 }
52 }
53
54 protected uint m_localID;
55 public uint LocalID
56 {
57 get
58 {
59 return m_localID;
60 }
61 set
62 {
63 m_localID = value;
64 }
65 }
66
46 protected string m_name; 67 protected string m_name;
47 /// <summary> 68 /// <summary>
48 /// 69 ///
@@ -53,6 +74,32 @@ namespace OpenSim.Region.Environment.Scenes
53 set { m_name = value; } 74 set { m_name = value; }
54 } 75 }
55 76
77 protected LLObject.ObjectFlags m_flags = (LLObject.ObjectFlags) 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456 + 128;
78 public uint ObjectFlags
79 {
80 get
81 {
82 return (uint)m_flags;
83 }
84 set
85 {
86 m_flags =(LLObject.ObjectFlags) value;
87 }
88 }
89
90 protected ulong m_regionHandle;
91 public ulong RegionHandle
92 {
93 get
94 {
95 return m_regionHandle;
96 }
97 set
98 {
99 m_regionHandle = value;
100 }
101 }
102
56 protected LLVector3 m_offset; 103 protected LLVector3 m_offset;
57 public LLVector3 OffsetPosition 104 public LLVector3 OffsetPosition
58 { 105 {
@@ -79,6 +126,48 @@ namespace OpenSim.Region.Environment.Scenes
79 } 126 }
80 } 127 }
81 128
129 protected LLVector3 m_velocity;
130 /// <summary></summary>
131 public LLVector3 Velocity
132 {
133 get
134 {
135 return m_velocity;
136 }
137 set
138 {
139 m_velocity = value;
140 }
141 }
142
143 protected LLVector3 m_angularVelocity;
144 /// <summary></summary>
145 public LLVector3 AngularVelocity
146 {
147 get
148 {
149 return m_angularVelocity;
150 }
151 set
152 {
153 m_angularVelocity = value;
154 }
155 }
156
157 protected LLVector3 m_acceleration;
158 /// <summary></summary>
159 public LLVector3 Acceleration
160 {
161 get
162 {
163 return m_acceleration;
164 }
165 set
166 {
167 m_acceleration = value;
168 }
169 }
170
82 private string m_description = ""; 171 private string m_description = "";
83 public string Description 172 public string Description
84 { 173 {
@@ -123,14 +212,14 @@ namespace OpenSim.Region.Environment.Scenes
123 this.OwnerID = ownerID; 212 this.OwnerID = ownerID;
124 this.CreatorID = this.OwnerID; 213 this.CreatorID = this.OwnerID;
125 this.LastOwnerID = LLUUID.Zero; 214 this.LastOwnerID = LLUUID.Zero;
126 this.uuid = LLUUID.Random(); 215 this.UUID = LLUUID.Random();
127 this.m_localID = (uint)(localID); 216 this.LocalID = (uint)(localID);
128 this.m_Shape = shape; 217 this.m_Shape = shape;
129 218
130 this.OffsetPosition = position; 219 this.OffsetPosition = position;
131 220
132 //temporary code just so the m_flags field doesn't give a compiler warning 221 //temporary code just so the m_flags field doesn't give a compiler warning
133 if (m_flags == 1) 222 if (m_flags ==LLObject.ObjectFlags.AllowInventoryDrop)
134 { 223 {
135 224
136 } 225 }