diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index bdfad40..bb65322 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -671,19 +671,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
671 | private uint m_parentID; | 671 | private uint m_parentID; |
672 | 672 | ||
673 | 673 | ||
674 | private UUID m_linkedPrim; | ||
675 | |||
676 | public uint ParentID | 674 | public uint ParentID |
677 | { | 675 | { |
678 | get { return m_parentID; } | 676 | get { return m_parentID; } |
679 | set { m_parentID = value; } | 677 | set { m_parentID = value; } |
680 | } | 678 | } |
681 | 679 | ||
682 | public UUID LinkedPrim | ||
683 | { | ||
684 | get { return m_linkedPrim; } | ||
685 | set { m_linkedPrim = value; } | ||
686 | } | ||
687 | 680 | ||
688 | public float Health | 681 | public float Health |
689 | { | 682 | { |
@@ -2056,7 +2049,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2056 | 2049 | ||
2057 | m_parentPosition = Vector3.Zero; | 2050 | m_parentPosition = Vector3.Zero; |
2058 | m_parentID = 0; | 2051 | m_parentID = 0; |
2059 | m_linkedPrim = UUID.Zero; | ||
2060 | m_offsetRotation = new Quaternion(0.0f, 0.0f, 0.0f, 1.0f); | 2052 | m_offsetRotation = new Quaternion(0.0f, 0.0f, 0.0f, 1.0f); |
2061 | SendAvatarDataToAllAgents(); | 2053 | SendAvatarDataToAllAgents(); |
2062 | m_requestedSitTargetID = 0; | 2054 | m_requestedSitTargetID = 0; |
@@ -2513,7 +2505,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2513 | } | 2505 | } |
2514 | */ | 2506 | */ |
2515 | 2507 | ||
2516 | |||
2517 | public void HandleAgentSit(IClientAPI remoteClient, UUID agentID) | 2508 | public void HandleAgentSit(IClientAPI remoteClient, UUID agentID) |
2518 | { | 2509 | { |
2519 | if (!String.IsNullOrEmpty(m_nextSitAnimation)) | 2510 | if (!String.IsNullOrEmpty(m_nextSitAnimation)) |
@@ -2616,7 +2607,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2616 | m_parentID = m_requestedSitTargetID; | 2607 | m_parentID = m_requestedSitTargetID; |
2617 | } | 2608 | } |
2618 | 2609 | ||
2619 | m_linkedPrim = part.UUID; | ||
2620 | if (part.GetAvatarOnSitTarget() != UUID) | 2610 | if (part.GetAvatarOnSitTarget() != UUID) |
2621 | { | 2611 | { |
2622 | m_offsetRotation = m_offsetRotation / part.RotationOffset; | 2612 | m_offsetRotation = m_offsetRotation / part.RotationOffset; |