aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-10 20:10:23 +0000
committerJustin Clarke Casey2008-11-10 20:10:23 +0000
commit13cf89bf3b4496bb2f9d213b4f86a4eb82f8d7b4 (patch)
treebb5c9721d30e335e43114f161cb9e854dd8e22a4 /OpenSim
parent* refactor: Expose SOG.SetRootPart for outsiders to use rather than setting R... (diff)
downloadopensim-SC_OLD-13cf89bf3b4496bb2f9d213b4f86a4eb82f8d7b4.zip
opensim-SC_OLD-13cf89bf3b4496bb2f9d213b4f86a4eb82f8d7b4.tar.gz
opensim-SC_OLD-13cf89bf3b4496bb2f9d213b4f86a4eb82f8d7b4.tar.bz2
opensim-SC_OLD-13cf89bf3b4496bb2f9d213b4f86a4eb82f8d7b4.tar.xz
* minor: remove useless exception catch
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs10
-rw-r--r--OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs2
2 files changed, 2 insertions, 10 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index d2bd698..ed087a4 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -897,15 +897,7 @@ namespace OpenSim.Region.Environment.Scenes
897 lock (m_parts) 897 lock (m_parts)
898 { 898 {
899 part.SetParent(this); 899 part.SetParent(this);
900 900 m_parts.Add(part.UUID, part);
901 try
902 {
903 m_parts.Add(part.UUID, part);
904 }
905 catch (Exception e)
906 {
907 m_log.Error("Failed to add scene object part", e);
908 }
909 901
910 part.LinkNum = m_parts.Count; 902 part.LinkNum = m_parts.Count;
911 903
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs
index de37eb4..93b13f7 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Region.Environment.Scenes.Tests
56 } 56 }
57 57
58 /// <summary> 58 /// <summary>
59 /// Test adding an object to a scene. Doesn't yet do what it says on the tin. 59 /// Test adding an object to a scene.
60 /// </summary> 60 /// </summary>
61 [Test] 61 [Test]
62 public void TestAddSceneObject() 62 public void TestAddSceneObject()