Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

2 files changed, 14 insertions, 5 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 6555b54..dd7d831 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -264,8 +264,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     if (AttachmentPt != 0 && AttachmentPt != objatt.GetAttachmentPoint())
                         tainted = true;
 
-                    AttachObject(remoteClient, objatt, AttachmentPt, false);
-                    //objatt.ScheduleGroupForFullUpdate();
+                    // This will throw if the attachment fails
+                    try
+                    {
+                        AttachObject(remoteClient, objatt, AttachmentPt, false);
+                    }
+                    catch
+                    {
+                        // Make sure the object doesn't stick around and bail
+                        m_scene.DeleteSceneObject(objatt, false);
+                        return null;
+                    }
                     
                     if (tainted)
                         objatt.HasGroupChanged = true;
@@ -594,4 +603,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             so.HasGroupChanged = false;            
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
index 62761fb..e3ef263 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
@@ -307,7 +307,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         public void TestDelinkPersistence()
         {
             TestHelper.InMethod();
-            log4net.Config.XmlConfigurator.Configure();
+            //log4net.Config.XmlConfigurator.Configure();
             
             TestScene scene = SceneSetupHelpers.SetupScene();            
             
@@ -342,4 +342,4 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             Assert.That(storedObjects[0].Children.ContainsKey(rootPartUuid));
         }
     }
-}
\ No newline at end of file
+}