aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs110
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs6
2 files changed, 58 insertions, 58 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index bf4c55c..7a6449d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -119,7 +119,7 @@ namespace OpenSim.Region.Framework.Scenes
119 /// <value> 119 /// <value>
120 /// Is this sop a root part? 120 /// Is this sop a root part?
121 /// </value> 121 /// </value>
122 [XmlIgnore] 122
123 public bool IsRoot 123 public bool IsRoot
124 { 124 {
125 get { return ParentGroup.RootPart == this; } 125 get { return ParentGroup.RootPart == this; }
@@ -129,26 +129,26 @@ namespace OpenSim.Region.Framework.Scenes
129 129
130 public bool AllowedDrop; 130 public bool AllowedDrop;
131 131
132 [XmlIgnore] 132
133 public bool DIE_AT_EDGE; 133 public bool DIE_AT_EDGE;
134 134
135 [XmlIgnore] 135
136 public bool RETURN_AT_EDGE; 136 public bool RETURN_AT_EDGE;
137 137
138 [XmlIgnore] 138
139 public bool BlockGrab; 139 public bool BlockGrab;
140 140
141 [XmlIgnore] 141
142 public bool StatusSandbox; 142 public bool StatusSandbox;
143 143
144 [XmlIgnore] 144
145 public Vector3 StatusSandboxPos; 145 public Vector3 StatusSandboxPos;
146 146
147 // TODO: This needs to be persisted in next XML version update! 147 // TODO: This needs to be persisted in next XML version update!
148 [XmlIgnore] 148
149 public readonly int[] PayPrice = {-2,-2,-2,-2,-2}; 149 public readonly int[] PayPrice = {-2,-2,-2,-2,-2};
150 150
151 [XmlIgnore] 151
152 public PhysicsActor PhysActor 152 public PhysicsActor PhysActor
153 { 153 {
154 get { return m_physActor; } 154 get { return m_physActor; }
@@ -163,43 +163,43 @@ namespace OpenSim.Region.Framework.Scenes
163 // Note: This isn't persisted in the database right now, as the fields for that aren't just there yet. 163 // Note: This isn't persisted in the database right now, as the fields for that aren't just there yet.
164 // Not a big problem as long as the script that sets it remains in the prim on startup. 164 // Not a big problem as long as the script that sets it remains in the prim on startup.
165 // for SL compatibility it should be persisted though (set sound / displaytext / particlesystem, kill script) 165 // for SL compatibility it should be persisted though (set sound / displaytext / particlesystem, kill script)
166 [XmlIgnore] 166
167 public UUID Sound; 167 public UUID Sound;
168 168
169 [XmlIgnore] 169
170 public byte SoundFlags; 170 public byte SoundFlags;
171 171
172 [XmlIgnore] 172
173 public double SoundGain; 173 public double SoundGain;
174 174
175 [XmlIgnore] 175
176 public double SoundRadius; 176 public double SoundRadius;
177 177
178 [XmlIgnore] 178
179 public uint TimeStampFull; 179 public uint TimeStampFull;
180 180
181 [XmlIgnore] 181
182 public uint TimeStampLastActivity; // Will be used for AutoReturn 182 public uint TimeStampLastActivity; // Will be used for AutoReturn
183 183
184 [XmlIgnore] 184
185 public uint TimeStampTerse; 185 public uint TimeStampTerse;
186 186
187 [XmlIgnore] 187
188 public UUID FromItemID; 188 public UUID FromItemID;
189 189
190 [XmlIgnore] 190
191 public UUID FromFolderID; 191 public UUID FromFolderID;
192 192
193 [XmlIgnore] 193
194 public int STATUS_ROTATE_X; 194 public int STATUS_ROTATE_X;
195 195
196 [XmlIgnore] 196
197 public int STATUS_ROTATE_Y; 197 public int STATUS_ROTATE_Y;
198 198
199 [XmlIgnore] 199
200 public int STATUS_ROTATE_Z; 200 public int STATUS_ROTATE_Z;
201 201
202 [XmlIgnore] 202
203 private Dictionary<int, string> m_CollisionFilter = new Dictionary<int, string>(); 203 private Dictionary<int, string> m_CollisionFilter = new Dictionary<int, string>();
204 204
205 /// <value> 205 /// <value>
@@ -208,68 +208,68 @@ namespace OpenSim.Region.Framework.Scenes
208 /// </value> 208 /// </value>
209 private UUID m_fromUserInventoryItemID; 209 private UUID m_fromUserInventoryItemID;
210 210
211 [XmlIgnore] 211
212 public UUID FromUserInventoryItemID 212 public UUID FromUserInventoryItemID
213 { 213 {
214 get { return m_fromUserInventoryItemID; } 214 get { return m_fromUserInventoryItemID; }
215 } 215 }
216 216
217 [XmlIgnore] 217
218 public bool IsAttachment; 218 public bool IsAttachment;
219 219
220 [XmlIgnore] 220
221 public scriptEvents AggregateScriptEvents; 221 public scriptEvents AggregateScriptEvents;
222 222
223 [XmlIgnore] 223
224 public UUID AttachedAvatar; 224 public UUID AttachedAvatar;
225 225
226 [XmlIgnore] 226
227 public Vector3 AttachedPos; 227 public Vector3 AttachedPos;
228 228
229 [XmlIgnore] 229
230 public uint AttachmentPoint; 230 public uint AttachmentPoint;
231 231
232 [XmlIgnore] 232
233 public Vector3 RotationAxis = Vector3.One; 233 public Vector3 RotationAxis = Vector3.One;
234 234
235 [XmlIgnore] 235
236 public bool VolumeDetectActive; // XmlIgnore set to avoid problems with persistance until I come to care for this 236 public bool VolumeDetectActive; // XmlIgnore set to avoid problems with persistance until I come to care for this
237 // Certainly this must be a persistant setting finally 237 // Certainly this must be a persistant setting finally
238 238
239 [XmlIgnore] 239
240 public bool IsWaitingForFirstSpinUpdatePacket; 240 public bool IsWaitingForFirstSpinUpdatePacket;
241 241
242 [XmlIgnore] 242
243 public Quaternion SpinOldOrientation = Quaternion.Identity; 243 public Quaternion SpinOldOrientation = Quaternion.Identity;
244 244
245 [XmlIgnore] 245
246 public Quaternion m_APIDTarget = Quaternion.Identity; 246 public Quaternion m_APIDTarget = Quaternion.Identity;
247 247
248 [XmlIgnore] 248
249 public float m_APIDDamp = 0; 249 public float m_APIDDamp = 0;
250 250
251 [XmlIgnore] 251
252 public float m_APIDStrength = 0; 252 public float m_APIDStrength = 0;
253 253
254 /// <summary> 254 /// <summary>
255 /// This part's inventory 255 /// This part's inventory
256 /// </summary> 256 /// </summary>
257 [XmlIgnore] 257
258 public IEntityInventory Inventory 258 public IEntityInventory Inventory
259 { 259 {
260 get { return m_inventory; } 260 get { return m_inventory; }
261 } 261 }
262 protected SceneObjectPartInventory m_inventory; 262 protected SceneObjectPartInventory m_inventory;
263 263
264 [XmlIgnore] 264
265 public bool Undoing; 265 public bool Undoing;
266 266
267 [XmlIgnore] 267
268 public bool IgnoreUndoUpdate = false; 268 public bool IgnoreUndoUpdate = false;
269 269
270 [XmlIgnore] 270
271 private PrimFlags LocalFlags; 271 private PrimFlags LocalFlags;
272 [XmlIgnore] 272
273 private float m_damage = -1.0f; 273 private float m_damage = -1.0f;
274 private byte[] m_TextureAnimation; 274 private byte[] m_TextureAnimation;
275 private byte m_clickAction; 275 private byte m_clickAction;
@@ -277,9 +277,9 @@ namespace OpenSim.Region.Framework.Scenes
277 private string m_description = String.Empty; 277 private string m_description = String.Empty;
278 private readonly List<uint> m_lastColliders = new List<uint>(); 278 private readonly List<uint> m_lastColliders = new List<uint>();
279 private int m_linkNum; 279 private int m_linkNum;
280 [XmlIgnore] 280
281 private int m_scriptAccessPin; 281 private int m_scriptAccessPin;
282 [XmlIgnore] 282
283 private readonly Dictionary<UUID, scriptEvents> m_scriptEvents = new Dictionary<UUID, scriptEvents>(); 283 private readonly Dictionary<UUID, scriptEvents> m_scriptEvents = new Dictionary<UUID, scriptEvents>();
284 private string m_sitName = String.Empty; 284 private string m_sitName = String.Empty;
285 private Quaternion m_sitTargetOrientation = Quaternion.Identity; 285 private Quaternion m_sitTargetOrientation = Quaternion.Identity;
@@ -545,7 +545,7 @@ namespace OpenSim.Region.Framework.Scenes
545 } 545 }
546 546
547 547
548 [XmlIgnore] 548
549 public Dictionary<int, string> CollisionFilter 549 public Dictionary<int, string> CollisionFilter
550 { 550 {
551 get { return m_CollisionFilter; } 551 get { return m_CollisionFilter; }
@@ -555,21 +555,21 @@ namespace OpenSim.Region.Framework.Scenes
555 } 555 }
556 } 556 }
557 557
558 [XmlIgnore] 558
559 public Quaternion APIDTarget 559 public Quaternion APIDTarget
560 { 560 {
561 get { return m_APIDTarget; } 561 get { return m_APIDTarget; }
562 set { m_APIDTarget = value; } 562 set { m_APIDTarget = value; }
563 } 563 }
564 564
565 [XmlIgnore] 565
566 public float APIDDamp 566 public float APIDDamp
567 { 567 {
568 get { return m_APIDDamp; } 568 get { return m_APIDDamp; }
569 set { m_APIDDamp = value; } 569 set { m_APIDDamp = value; }
570 } 570 }
571 571
572 [XmlIgnore] 572
573 public float APIDStrength 573 public float APIDStrength
574 { 574 {
575 get { return m_APIDStrength; } 575 get { return m_APIDStrength; }
@@ -615,35 +615,35 @@ namespace OpenSim.Region.Framework.Scenes
615 set { m_LoopSoundSlavePrims = value; } 615 set { m_LoopSoundSlavePrims = value; }
616 } 616 }
617 617
618 [XmlIgnore] 618
619 public Byte[] TextureAnimation 619 public Byte[] TextureAnimation
620 { 620 {
621 get { return m_TextureAnimation; } 621 get { return m_TextureAnimation; }
622 set { m_TextureAnimation = value; } 622 set { m_TextureAnimation = value; }
623 } 623 }
624 624
625 [XmlIgnore] 625
626 public Byte[] ParticleSystem 626 public Byte[] ParticleSystem
627 { 627 {
628 get { return m_particleSystem; } 628 get { return m_particleSystem; }
629 set { m_particleSystem = value; } 629 set { m_particleSystem = value; }
630 } 630 }
631 631
632 [XmlIgnore] 632
633 public DateTime Expires 633 public DateTime Expires
634 { 634 {
635 get { return m_expires; } 635 get { return m_expires; }
636 set { m_expires = value; } 636 set { m_expires = value; }
637 } 637 }
638 638
639 [XmlIgnore] 639
640 public DateTime Rezzed 640 public DateTime Rezzed
641 { 641 {
642 get { return m_rezzed; } 642 get { return m_rezzed; }
643 set { m_rezzed = value; } 643 set { m_rezzed = value; }
644 } 644 }
645 645
646 [XmlIgnore] 646
647 public float Damage 647 public float Damage
648 { 648 {
649 get { return m_damage; } 649 get { return m_damage; }
@@ -1016,7 +1016,7 @@ namespace OpenSim.Region.Framework.Scenes
1016 } 1016 }
1017 } 1017 }
1018 1018
1019 [XmlIgnore] 1019
1020 public bool CreateSelected 1020 public bool CreateSelected
1021 { 1021 {
1022 get { return m_createSelected; } 1022 get { return m_createSelected; }
@@ -1198,14 +1198,14 @@ namespace OpenSim.Region.Framework.Scenes
1198 } 1198 }
1199 } 1199 }
1200 1200
1201 [XmlIgnore] 1201
1202 public UUID SitTargetAvatar 1202 public UUID SitTargetAvatar
1203 { 1203 {
1204 get { return m_sitTargetAvatar; } 1204 get { return m_sitTargetAvatar; }
1205 set { m_sitTargetAvatar = value; } 1205 set { m_sitTargetAvatar = value; }
1206 } 1206 }
1207 1207
1208 [XmlIgnore] 1208
1209 public virtual UUID RegionID 1209 public virtual UUID RegionID
1210 { 1210 {
1211 get 1211 get
@@ -1219,7 +1219,7 @@ namespace OpenSim.Region.Framework.Scenes
1219 } 1219 }
1220 1220
1221 private UUID _parentUUID = UUID.Zero; 1221 private UUID _parentUUID = UUID.Zero;
1222 [XmlIgnore] 1222
1223 public UUID ParentUUID 1223 public UUID ParentUUID
1224 { 1224 {
1225 get 1225 get
@@ -1233,7 +1233,7 @@ namespace OpenSim.Region.Framework.Scenes
1233 set { _parentUUID = value; } 1233 set { _parentUUID = value; }
1234 } 1234 }
1235 1235
1236 [XmlIgnore] 1236
1237 public string SitAnimation 1237 public string SitAnimation
1238 { 1238 {
1239 get { return m_sitAnimation; } 1239 get { return m_sitAnimation; }
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 4897cd6..252304b 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -149,7 +149,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
149 149
150 writer.WriteStartElement(String.Empty, "SceneObjectGroup", String.Empty); 150 writer.WriteStartElement(String.Empty, "SceneObjectGroup", String.Empty);
151 writer.WriteStartElement(String.Empty, "RootPart", String.Empty); 151 writer.WriteStartElement(String.Empty, "RootPart", String.Empty);
152 ToOriginalXmlFormat(sceneObject.RootPart, writer); 152 ToXmlFormat(sceneObject.RootPart, writer);
153 writer.WriteEndElement(); 153 writer.WriteEndElement();
154 writer.WriteStartElement(String.Empty, "OtherParts", String.Empty); 154 writer.WriteStartElement(String.Empty, "OtherParts", String.Empty);
155 155
@@ -160,7 +160,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
160 if (part.UUID != sceneObject.RootPart.UUID) 160 if (part.UUID != sceneObject.RootPart.UUID)
161 { 161 {
162 writer.WriteStartElement(String.Empty, "Part", String.Empty); 162 writer.WriteStartElement(String.Empty, "Part", String.Empty);
163 ToOriginalXmlFormat(part, writer); 163 ToXmlFormat(part, writer);
164 writer.WriteEndElement(); 164 writer.WriteEndElement();
165 } 165 }
166 } 166 }
@@ -172,7 +172,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
172 //m_log.DebugFormat("[SERIALIZER]: Finished serialization of SOG {0}, {1}ms", Name, System.Environment.TickCount - time); 172 //m_log.DebugFormat("[SERIALIZER]: Finished serialization of SOG {0}, {1}ms", Name, System.Environment.TickCount - time);
173 } 173 }
174 174
175 protected static void ToOriginalXmlFormat(SceneObjectPart part, XmlTextWriter writer) 175 protected static void ToXmlFormat(SceneObjectPart part, XmlTextWriter writer)
176 { 176 {
177 SOPToXml2(writer, part, new Dictionary<string, object>()); 177 SOPToXml2(writer, part, new Dictionary<string, object>());
178 } 178 }