aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs16
-rw-r--r--OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs149
2 files changed, 38 insertions, 127 deletions
diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs
index 35b6fef..8ed04d9 100644
--- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs
+++ b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs
@@ -27,10 +27,7 @@ namespace OpenSim.Region.Environment.Scenes
27 /// </summary> 27 /// </summary>
28 public int PrimCount 28 public int PrimCount
29 { 29 {
30 get 30 get { return 1; }
31 {
32 return 1;
33 }
34 } 31 }
35 32
36 /// <summary> 33 /// <summary>
@@ -38,10 +35,7 @@ namespace OpenSim.Region.Environment.Scenes
38 /// </summary> 35 /// </summary>
39 public LLVector3 GroupCentrePoint 36 public LLVector3 GroupCentrePoint
40 { 37 {
41 get 38 get { return new LLVector3(0, 0, 0); }
42 {
43 return new LLVector3(0, 0, 0);
44 }
45 } 39 }
46 40
47 /// <summary> 41 /// <summary>
@@ -83,13 +77,13 @@ namespace OpenSim.Region.Environment.Scenes
83 /// <returns></returns> 77 /// <returns></returns>
84 public new AllNewSceneObjectGroup2 Copy() 78 public new AllNewSceneObjectGroup2 Copy()
85 { 79 {
86 AllNewSceneObjectGroup2 dupe = (AllNewSceneObjectGroup2) this.MemberwiseClone(); 80 AllNewSceneObjectGroup2 dupe = (AllNewSceneObjectGroup2)this.MemberwiseClone();
87 dupe.Pos = new LLVector3(Pos.X, Pos.Y, Pos.Z); 81 dupe.Pos = new LLVector3(Pos.X, Pos.Y, Pos.Z);
88 dupe.m_scene = m_scene; 82 dupe.m_scene = m_scene;
89 dupe.m_regionHandle = this.m_regionHandle; 83 dupe.m_regionHandle = this.m_regionHandle;
90 84
91 dupe.CopyRootPart(this.m_rootPart); 85 dupe.CopyRootPart(this.m_rootPart);
92 86
93 foreach (AllNewSceneObjectPart2 part in this.m_parts.Values) 87 foreach (AllNewSceneObjectPart2 part in this.m_parts.Values)
94 { 88 {
95 if (part.UUID != this.m_rootPart.UUID) 89 if (part.UUID != this.m_rootPart.UUID)
@@ -517,7 +511,7 @@ namespace OpenSim.Region.Environment.Scenes
517 /// <returns></returns> 511 /// <returns></returns>
518 public List<ScenePresence> RequestSceneAvatars() 512 public List<ScenePresence> RequestSceneAvatars()
519 { 513 {
520 return m_scene.RequestAvatarList(); 514 return m_scene.RequestAvatarList();
521 } 515 }
522 } 516 }
523} 517}
diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
index 50bdb5d..65b4287 100644
--- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
+++ b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
@@ -38,31 +38,19 @@ namespace OpenSim.Region.Environment.Scenes
38 private byte m_updateFlag; 38 private byte m_updateFlag;
39 39
40 #region Properties 40 #region Properties
41 41
42 protected LLUUID m_uuid; 42 protected LLUUID m_uuid;
43 public LLUUID UUID 43 public LLUUID UUID
44 { 44 {
45 get 45 get { return m_uuid; }
46 { 46 set { value = m_uuid; }
47 return m_uuid;
48 }
49 set
50 {
51 value = m_uuid;
52 }
53 } 47 }
54 48
55 protected uint m_localID; 49 protected uint m_localID;
56 public uint LocalID 50 public uint LocalID
57 { 51 {
58 get 52 get { return m_localID; }
59 { 53 set { m_localID = value; }
60 return m_localID;
61 }
62 set
63 {
64 m_localID = value;
65 }
66 } 54 }
67 55
68 protected string m_name; 56 protected string m_name;
@@ -75,124 +63,70 @@ namespace OpenSim.Region.Environment.Scenes
75 set { m_name = value; } 63 set { m_name = value; }
76 } 64 }
77 65
78 protected LLObject.ObjectFlags m_flags = (LLObject.ObjectFlags) 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456 + 128; 66 protected LLObject.ObjectFlags m_flags = (LLObject.ObjectFlags)32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456 + 128;
79 public uint ObjectFlags 67 public uint ObjectFlags
80 { 68 {
81 get 69 get { return (uint)m_flags; }
82 { 70 set { m_flags = (LLObject.ObjectFlags)value; }
83 return (uint)m_flags;
84 }
85 set
86 {
87 m_flags =(LLObject.ObjectFlags) value;
88 }
89 } 71 }
90 72
91 protected LLObject.MaterialType m_material; 73 protected LLObject.MaterialType m_material;
92 public byte Material 74 public byte Material
93 { 75 {
94 get 76 get { return (byte)m_material; }
95 { 77 set { m_material = (LLObject.MaterialType)value; }
96 return (byte)m_material;
97 }
98 set
99 {
100 m_material = (LLObject.MaterialType) value;
101 }
102 } 78 }
103 79
104 protected ulong m_regionHandle; 80 protected ulong m_regionHandle;
105 public ulong RegionHandle 81 public ulong RegionHandle
106 { 82 {
107 get 83 get { return m_regionHandle; }
108 { 84 set { m_regionHandle = value; }
109 return m_regionHandle;
110 }
111 set
112 {
113 m_regionHandle = value;
114 }
115 } 85 }
116 86
117 protected LLVector3 m_offset; 87 protected LLVector3 m_offset;
118 public LLVector3 OffsetPosition 88 public LLVector3 OffsetPosition
119 { 89 {
120 get 90 get { return m_offset; }
121 { 91 set { m_offset = value; }
122 return m_offset;
123 }
124 set
125 {
126 m_offset = value;
127 }
128 } 92 }
129 93
130 protected LLQuaternion m_rotationOffset; 94 protected LLQuaternion m_rotationOffset;
131 public LLQuaternion RotationOffset 95 public LLQuaternion RotationOffset
132 { 96 {
133 get 97 get { return m_rotationOffset; }
134 { 98 set { m_rotationOffset = value; }
135 return m_rotationOffset;
136 }
137 set
138 {
139 m_rotationOffset = value;
140 }
141 } 99 }
142 100
143 protected LLVector3 m_velocity; 101 protected LLVector3 m_velocity;
144 /// <summary></summary> 102 /// <summary></summary>
145 public LLVector3 Velocity 103 public LLVector3 Velocity
146 { 104 {
147 get 105 get { return m_velocity; }
148 { 106 set { m_velocity = value; }
149 return m_velocity;
150 }
151 set
152 {
153 m_velocity = value;
154 }
155 } 107 }
156 108
157 protected LLVector3 m_angularVelocity; 109 protected LLVector3 m_angularVelocity;
158 /// <summary></summary> 110 /// <summary></summary>
159 public LLVector3 AngularVelocity 111 public LLVector3 AngularVelocity
160 { 112 {
161 get 113 get { return m_angularVelocity; }
162 { 114 set { m_angularVelocity = value; }
163 return m_angularVelocity;
164 }
165 set
166 {
167 m_angularVelocity = value;
168 }
169 } 115 }
170 116
171 protected LLVector3 m_acceleration; 117 protected LLVector3 m_acceleration;
172 /// <summary></summary> 118 /// <summary></summary>
173 public LLVector3 Acceleration 119 public LLVector3 Acceleration
174 { 120 {
175 get 121 get { return m_acceleration; }
176 { 122 set { m_acceleration = value; }
177 return m_acceleration;
178 }
179 set
180 {
181 m_acceleration = value;
182 }
183 } 123 }
184 124
185 private string m_description = ""; 125 private string m_description = "";
186 public string Description 126 public string Description
187 { 127 {
188 get 128 get { return this.m_description; }
189 { 129 set { this.m_description = value; }
190 return this.m_description;
191 }
192 set
193 {
194 this.m_description = value;
195 }
196 } 130 }
197 131
198 private string m_text = ""; 132 private string m_text = "";
@@ -210,44 +144,27 @@ namespace OpenSim.Region.Environment.Scenes
210 public string SitName 144 public string SitName
211 { 145 {
212 get { return m_sitName; } 146 get { return m_sitName; }
213 set 147 set { m_sitName = value; }
214 {
215 m_sitName = value;
216 }
217 } 148 }
218 149
219 private string m_touchName = ""; 150 private string m_touchName = "";
220 public string TouchName 151 public string TouchName
221 { 152 {
222 get { return m_touchName; } 153 get { return m_touchName; }
223 set 154 set { m_touchName = value; }
224 {
225 m_touchName = value;
226 }
227 } 155 }
228 156
229 public PrimitiveBaseShape Shape 157 public PrimitiveBaseShape Shape
230 { 158 {
231 get 159
232 { 160 get { return this.m_shape; }
233 return this.m_shape; 161 set { m_shape = value; }
234 }
235 set
236 {
237 m_shape = value;
238 }
239 } 162 }
240 163
241 public LLVector3 Scale 164 public LLVector3 Scale
242 { 165 {
243 set 166 set { this.m_shape.Scale = value; }
244 { 167 get { return this.m_shape.Scale; }
245 this.m_shape.Scale = value;
246 }
247 get
248 {
249 return this.m_shape.Scale;
250 }
251 } 168 }
252 #endregion 169 #endregion
253 170
@@ -289,7 +206,7 @@ namespace OpenSim.Region.Environment.Scenes
289 this.Acceleration = new LLVector3(0, 0, 0); 206 this.Acceleration = new LLVector3(0, 0, 0);
290 207
291 //temporary code just so the m_flags field doesn't give a compiler warning 208 //temporary code just so the m_flags field doesn't give a compiler warning
292 if (m_flags ==LLObject.ObjectFlags.AllowInventoryDrop) 209 if (m_flags == LLObject.ObjectFlags.AllowInventoryDrop)
293 { 210 {
294 211
295 } 212 }
@@ -330,7 +247,7 @@ namespace OpenSim.Region.Environment.Scenes
330 /// <returns></returns> 247 /// <returns></returns>
331 public AllNewSceneObjectPart2 Copy(Scene scene) 248 public AllNewSceneObjectPart2 Copy(Scene scene)
332 { 249 {
333 AllNewSceneObjectPart2 dupe =(AllNewSceneObjectPart2) this.MemberwiseClone(); 250 AllNewSceneObjectPart2 dupe = (AllNewSceneObjectPart2)this.MemberwiseClone();
334 dupe.m_shape = m_shape.Copy(); 251 dupe.m_shape = m_shape.Copy();
335 dupe.m_regionHandle = m_regionHandle; 252 dupe.m_regionHandle = m_regionHandle;
336 uint newLocalID = scene.PrimIDAllocate(); 253 uint newLocalID = scene.PrimIDAllocate();