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

remove unused and wrong methods

httptests
UbitUmarov 2017-01-26 19:51:50 +00:00
parent ed365f6220
commit cdc23bab74
2 changed files with 1 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1569,7 +1569,7 @@ namespace OpenSim.Region.Framework.Scenes
if (group.IsAttachment || (group.RootPart.Shape.PCode == 9 && group.RootPart.Shape.State != 0)) if (group.IsAttachment || (group.RootPart.Shape.PCode == 9 && group.RootPart.Shape.State != 0))
{ {
// Set the new attachment point data in the object // Set the new attachment point data in the object
byte attachmentPoint = group.GetAttachmentPoint(); byte attachmentPoint = (byte)group.AttachmentPoint;
group.UpdateGroupPosition(pos); group.UpdateGroupPosition(pos);
group.IsAttachment = false; group.IsAttachment = false;
group.AbsolutePosition = group.RootPart.AttachedPos; group.AbsolutePosition = group.RootPart.AttachedPos;

57
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -1783,63 +1783,6 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
/// <summary>
/// Attach this scene object to the given avatar.
/// </summary>
/// <param name="agentID"></param>
/// <param name="attachmentpoint"></param>
/// <param name="AttachOffset"></param>
private void AttachToAgent(
ScenePresence avatar, SceneObjectGroup so, uint attachmentpoint, Vector3 attachOffset, bool silent)
{
if (avatar != null)
{
// don't attach attachments to child agents
if (avatar.IsChildAgent) return;
// Remove from database and parcel prim count
m_scene.DeleteFromStorage(so.UUID);
m_scene.EventManager.TriggerParcelPrimCountTainted();
so.AttachedAvatar = avatar.UUID;
if (so.RootPart.PhysActor != null)
{
m_scene.PhysicsScene.RemovePrim(so.RootPart.PhysActor);
so.RootPart.PhysActor = null;
}
so.AbsolutePosition = attachOffset;
so.RootPart.AttachedPos = attachOffset;
so.IsAttachment = true;
so.RootPart.SetParentLocalId(avatar.LocalId);
so.AttachmentPoint = attachmentpoint;
avatar.AddAttachment(this);
if (!silent)
{
// Killing it here will cause the client to deselect it
// It then reappears on the avatar, deselected
// through the full update below
//
if (IsSelected)
{
m_scene.SendKillObject(new List<uint> { m_rootPart.LocalId });
}
IsSelected = false; // fudge....
ScheduleGroupForFullUpdate();
}
}
else
{
m_log.WarnFormat(
"[SOG]: Tried to add attachment {0} to avatar with UUID {1} in region {2} but the avatar is not present",
UUID, avatar.ControllingClient.AgentId, Scene.RegionInfo.RegionName);
}
}
public byte GetAttachmentPoint() public byte GetAttachmentPoint()
{ {
return m_rootPart.Shape.State; return m_rootPart.Shape.State;