aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs12
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs2
2 files changed, 12 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 5893988..78dd69c 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -119,7 +119,7 @@ namespace OpenSim.Region.Environment.Scenes
119 SceneObjectPart newPart = new SceneObjectPart(m_regionHandle, this, ownerID, localID, shape, pos, rootOffset); 119 SceneObjectPart newPart = new SceneObjectPart(m_regionHandle, this, ownerID, localID, shape, pos, rootOffset);
120 this.m_parts.Add(newPart.UUID, newPart); 120 this.m_parts.Add(newPart.UUID, newPart);
121 this.SetPartAsRoot(newPart); 121 this.SetPartAsRoot(newPart);
122 122 m_scene.EventManager.OnBackup += this.ProcessBackup;
123 } 123 }
124 124
125 125
@@ -311,7 +311,15 @@ namespace OpenSim.Region.Environment.Scenes
311 this.OnPrimCountTainted(); 311 this.OnPrimCountTainted();
312 } 312 }
313 } 313 }
314 314
315 /// <summary>
316 /// Processes backup
317 /// </summary>
318 /// <param name="datastore"></param>
319 public void ProcessBackup(OpenSim.Region.Interfaces.IRegionDataStore datastore)
320 {
321 datastore.StoreObject(this);
322 }
315 /// <summary> 323 /// <summary>
316 /// 324 ///
317 /// </summary> 325 /// </summary>
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index c711150..5e62082 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -211,6 +211,8 @@ namespace OpenSim.Region.Environment.Scenes
211 this.AngularVelocity = new LLVector3(0, 0, 0); 211 this.AngularVelocity = new LLVector3(0, 0, 0);
212 this.Acceleration = new LLVector3(0, 0, 0); 212 this.Acceleration = new LLVector3(0, 0, 0);
213 213
214
215
214 //temporary code just so the m_flags field doesn't give a compiler warning 216 //temporary code just so the m_flags field doesn't give a compiler warning
215 if (m_flags == LLObject.ObjectFlags.AllowInventoryDrop) 217 if (m_flags == LLObject.ObjectFlags.AllowInventoryDrop)
216 { 218 {