Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
commit
99bfb0d2a2
|
@ -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;
|
||||
|
|
|
@ -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();
|
||||
|
||||
|
|
Loading…
Reference in New Issue