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

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

viewer-2-initial-appearance
Justin Clark-Casey (justincc) 2010-09-07 02:01:38 +01:00
parent 11f4a65f42 36cb6208b5
commit 90cd035693
1 changed files with 12 additions and 3 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()) if (AttachmentPt != 0 && AttachmentPt != objatt.GetAttachmentPoint())
tainted = true; tainted = true;
AttachObject(remoteClient, objatt, AttachmentPt, false); // This will throw if the attachment fails
//objatt.ScheduleGroupForFullUpdate(); 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) if (tainted)
objatt.HasGroupChanged = true; objatt.HasGroupChanged = true;
@ -594,4 +603,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
so.HasGroupChanged = false; so.HasGroupChanged = false;
} }
} }
} }