aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSean Dague2008-03-04 18:49:44 +0000
committerSean Dague2008-03-04 18:49:44 +0000
commit92e54bdd17cbab59c97a26eb51190b2233abe8b4 (patch)
treea7480582c67941aac2c548d8a154c0486f9a3dcf
parentFrom: Dr Scofield <hud@zurich.ibm.com> (diff)
downloadopensim-SC_OLD-92e54bdd17cbab59c97a26eb51190b2233abe8b4.zip
opensim-SC_OLD-92e54bdd17cbab59c97a26eb51190b2233abe8b4.tar.gz
opensim-SC_OLD-92e54bdd17cbab59c97a26eb51190b2233abe8b4.tar.bz2
opensim-SC_OLD-92e54bdd17cbab59c97a26eb51190b2233abe8b4.tar.xz
this is probably just a band aid, but should at least
help figure out where my last crash came from by being extra careful arround Add for scene object group.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs12
1 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 4cc130e..575840e 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -1635,9 +1635,15 @@ namespace OpenSim.Region.Environment.Scenes
1635 /// <param name="part"></param> 1635 /// <param name="part"></param>
1636 public void AddPart(SceneObjectPart part) 1636 public void AddPart(SceneObjectPart part)
1637 { 1637 {
1638 part.SetParent(this); 1638 lock (m_parts) {
1639 part.LinkNum = m_parts.Count; 1639 part.SetParent(this);
1640 m_parts.Add(part.UUID, part); 1640 part.LinkNum = m_parts.Count;
1641 try {
1642 m_parts.Add(part.UUID, part);
1643 } catch (Exception e) {
1644 m_log.Error("Failed to add scened object part", e);
1645 }
1646 }
1641 } 1647 }
1642 1648
1643 /// <summary> 1649 /// <summary>