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

change position of OnAttach event firing so that this also happens when a user teleports into a region

mysql-performance
Justin Clark-Casey (justincc) 2010-02-03 15:35:41 +00:00
parent bbd41de6d5
commit b6bee4999c
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -2496,20 +2496,24 @@ namespace OpenSim.Region.Framework.Scenes
//RootPrim.SetParentLocalId(parentLocalID); //RootPrim.SetParentLocalId(parentLocalID);
m_log.DebugFormat("[ATTACHMENT]: Received " + m_log.DebugFormat(
"attachment {0}, inworld asset id {1}", "[ATTACHMENT]: Received attachment {0}, inworld asset id {1}",
//grp.RootPart.LastOwnerID.ToString(), //grp.RootPart.LastOwnerID.ToString(),
grp.GetFromItemID(), grp.GetFromItemID(),
grp.UUID.ToString()); grp.UUID.ToString());
//grp.SetFromAssetID(grp.RootPart.LastOwnerID); //grp.SetFromAssetID(grp.RootPart.LastOwnerID);
m_log.DebugFormat("[ATTACHMENT]: Attach " + m_log.DebugFormat(
"to avatar {0} at position {1}", "[ATTACHMENT]: Attach to avatar {0} at position {1}", sp.UUID.ToString(), grp.AbsolutePosition);
sp.UUID.ToString(), grp.AbsolutePosition);
AttachObject(sp.ControllingClient, if (
grp.LocalId, (uint)0, AttachObject(
grp.GroupRotation, sp.ControllingClient, grp.LocalId, (uint)0, grp.GroupRotation, grp.AbsolutePosition, false))
grp.AbsolutePosition, false); {
// Do this last so that event listeners have access to all the effects of the attachment
EventManager.TriggerOnAttach(grp.LocalId, UUID.Zero, sp.UUID);
}
RootPrim.RemFlag(PrimFlags.TemporaryOnRez); RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
grp.SendGroupFullUpdate(); grp.SendGroupFullUpdate();
} }
@ -2518,7 +2522,6 @@ namespace OpenSim.Region.Framework.Scenes
RootPrim.RemFlag(PrimFlags.TemporaryOnRez); RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
RootPrim.AddFlag(PrimFlags.TemporaryOnRez); RootPrim.AddFlag(PrimFlags.TemporaryOnRez);
} }
} }
else else
{ {

3
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@ -627,11 +627,10 @@ namespace OpenSim.Region.Framework.Scenes
} }
m_parentScene.AttachObject(remoteClient, AttachmentPt, itemId, group); m_parentScene.AttachObject(remoteClient, AttachmentPt, itemId, group);
group.AttachToAgent(remoteClient.AgentId, AttachmentPt, attachPos, silent); group.AttachToAgent(remoteClient.AgentId, AttachmentPt, attachPos, silent);
// In case it is later dropped again, don't let // In case it is later dropped again, don't let
// it get cleaned up // it get cleaned up
//
group.RootPart.RemFlag(PrimFlags.TemporaryOnRez); group.RootPart.RemFlag(PrimFlags.TemporaryOnRez);
group.HasGroupChanged = false; group.HasGroupChanged = false;
} }