OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

viewer-2-initial-appearance
Melanie 2010-09-07 01:45:08 +01:00
parent 3d033520fa 84ad9e4d4e
commit 99bfb0d2a2
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
View File

@ -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;
}
}
}
}

4
OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
View File

@ -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));
}
}
}
}