aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorTeravus Ovares2007-12-27 03:25:00 +0000
committerTeravus Ovares2007-12-27 03:25:00 +0000
commit87d55443d3fd3cc86dce0b8efe05a8c304f7d6c8 (patch)
tree69599226423b5a4620ab4308b3e0088328894bde /OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
parentPrim inventory persistence phase 1: Creation of preliminary table in sqlite. (diff)
downloadopensim-SC-87d55443d3fd3cc86dce0b8efe05a8c304f7d6c8.zip
opensim-SC-87d55443d3fd3cc86dce0b8efe05a8c304f7d6c8.tar.gz
opensim-SC-87d55443d3fd3cc86dce0b8efe05a8c304f7d6c8.tar.bz2
opensim-SC-87d55443d3fd3cc86dce0b8efe05a8c304f7d6c8.tar.xz
* Added slightly better object sit handling
* Added sit handling for sit targets * Implemented llSitTarget() * Implemented llAvatarOnSitTarget() * Sit targets do not persist sim restart.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs34
1 files changed, 34 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 34705db..bcd31c2 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -68,6 +68,11 @@ namespace OpenSim.Region.Environment.Scenes
68 public Int32 CreationDate; 68 public Int32 CreationDate;
69 public uint ParentID = 0; 69 public uint ParentID = 0;
70 70
71 private Vector3 m_sitTargetPosition = new Vector3(0, 0, 0);
72 private Quaternion m_sitTargetOrientation = new Quaternion(0, 0, 0, 1);
73 private LLUUID m_SitTargetAvatar = LLUUID.Zero;
74
75
71 // Main grid has default permissions as follows 76 // Main grid has default permissions as follows
72 // 77 //
73 public uint OwnerMask = FULL_MASK_PERMISSIONS_OWNER; 78 public uint OwnerMask = FULL_MASK_PERMISSIONS_OWNER;
@@ -161,6 +166,8 @@ namespace OpenSim.Region.Environment.Scenes
161 //unkown if this will be kept, added as a way of removing the group position from the group class 166 //unkown if this will be kept, added as a way of removing the group position from the group class
162 protected LLVector3 m_groupPosition; 167 protected LLVector3 m_groupPosition;
163 168
169
170
164 public LLVector3 GroupPosition 171 public LLVector3 GroupPosition
165 { 172 {
166 get 173 get
@@ -774,6 +781,33 @@ namespace OpenSim.Region.Environment.Scenes
774 m_parentGroup = parent; 781 m_parentGroup = parent;
775 } 782 }
776 783
784 public void SetSitTarget(Vector3 offset, Quaternion orientation)
785 {
786 m_sitTargetPosition = offset;
787 m_sitTargetOrientation = orientation;
788 }
789
790 public Vector3 GetSitTargetPosition()
791 {
792 return m_sitTargetPosition;
793 }
794
795 public Quaternion GetSitTargetOrientation()
796 {
797 return m_sitTargetOrientation;
798 }
799
800 public void SetAvatarOnSitTarget(LLUUID avatarID)
801 {
802 m_SitTargetAvatar = avatarID;
803 }
804
805 public LLUUID GetAvatarOnSitTarget()
806 {
807 return m_SitTargetAvatar;
808 }
809
810
777 public LLUUID GetRootPartUUID() 811 public LLUUID GetRootPartUUID()
778 { 812 {
779 if (m_parentGroup != null) 813 if (m_parentGroup != null)