aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-17 02:04:20 +0100
committerJustin Clark-Casey (justincc)2011-10-17 02:04:20 +0100
commit62a63f834b7cc056ee37c396034d0e268f66b4a8 (patch)
tree3c004905b9db2915536a29b46beccce66901ea5f /OpenSim/Region/Framework
parentrename OS_NPC_SIT_IMMEDIATE to OS_NPC_SIT_NOW since it's shorter and more und... (diff)
downloadopensim-SC_OLD-62a63f834b7cc056ee37c396034d0e268f66b4a8.zip
opensim-SC_OLD-62a63f834b7cc056ee37c396034d0e268f66b4a8.tar.gz
opensim-SC_OLD-62a63f834b7cc056ee37c396034d0e268f66b4a8.tar.bz2
opensim-SC_OLD-62a63f834b7cc056ee37c396034d0e268f66b4a8.tar.xz
refactor: Use SOP.SitTargetAvatar instead of calling a special GetAvatarOnSitTarget() which returned exactly the same thing
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs8
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs11
2 files changed, 9 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 703b986..c25c3b4 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1220,6 +1220,9 @@ namespace OpenSim.Region.Framework.Scenes
1220 } 1220 }
1221 } 1221 }
1222 1222
1223 /// <summary>
1224 /// ID of the avatar that is sat on us. If there is no such avatar then is UUID.Zero
1225 /// </summary>
1223 public UUID SitTargetAvatar 1226 public UUID SitTargetAvatar
1224 { 1227 {
1225 get { return m_sitTargetAvatar; } 1228 get { return m_sitTargetAvatar; }
@@ -1886,11 +1889,6 @@ namespace OpenSim.Region.Framework.Scenes
1886 return part; 1889 return part;
1887 } 1890 }
1888 1891
1889 public UUID GetAvatarOnSitTarget()
1890 {
1891 return m_sitTargetAvatar;
1892 }
1893
1894 public bool GetDieAtEdge() 1892 public bool GetDieAtEdge()
1895 { 1893 {
1896 if (m_parentGroup.IsDeleted) 1894 if (m_parentGroup.IsDeleted)
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index dd1a29d..e0fd84a 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1860,11 +1860,12 @@ namespace OpenSim.Region.Framework.Scenes
1860 4); // PERMISSION_TAKE_CONTROLS 1860 4); // PERMISSION_TAKE_CONTROLS
1861 } 1861 }
1862 } 1862 }
1863
1864 } 1863 }
1864
1865 // Reset sit target. 1865 // Reset sit target.
1866 if (part.GetAvatarOnSitTarget() == UUID) 1866 if (part.SitTargetAvatar == UUID)
1867 part.SitTargetAvatar = UUID.Zero; 1867 part.SitTargetAvatar = UUID.Zero;
1868
1868 part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK); 1869 part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
1869 1870
1870 ParentPosition = part.GetWorldPosition(); 1871 ParentPosition = part.GetWorldPosition();
@@ -1913,7 +1914,7 @@ namespace OpenSim.Region.Framework.Scenes
1913 // Is a sit target available? 1914 // Is a sit target available?
1914 Vector3 avSitOffSet = part.SitTargetPosition; 1915 Vector3 avSitOffSet = part.SitTargetPosition;
1915 Quaternion avSitOrientation = part.SitTargetOrientation; 1916 Quaternion avSitOrientation = part.SitTargetOrientation;
1916 UUID avOnTargetAlready = part.GetAvatarOnSitTarget(); 1917 UUID avOnTargetAlready = part.SitTargetAvatar;
1917 1918
1918 bool SitTargetUnOccupied = (!(avOnTargetAlready != UUID.Zero)); 1919 bool SitTargetUnOccupied = (!(avOnTargetAlready != UUID.Zero));
1919 bool SitTargetisSet = 1920 bool SitTargetisSet =
@@ -1950,7 +1951,7 @@ namespace OpenSim.Region.Framework.Scenes
1950 // Is a sit target available? 1951 // Is a sit target available?
1951 Vector3 avSitOffSet = part.SitTargetPosition; 1952 Vector3 avSitOffSet = part.SitTargetPosition;
1952 Quaternion avSitOrientation = part.SitTargetOrientation; 1953 Quaternion avSitOrientation = part.SitTargetOrientation;
1953 UUID avOnTargetAlready = part.GetAvatarOnSitTarget(); 1954 UUID avOnTargetAlready = part.SitTargetAvatar;
1954 1955
1955 bool SitTargetUnOccupied = (!(avOnTargetAlready != UUID.Zero)); 1956 bool SitTargetUnOccupied = (!(avOnTargetAlready != UUID.Zero));
1956 bool SitTargetisSet = 1957 bool SitTargetisSet =
@@ -2278,7 +2279,7 @@ namespace OpenSim.Region.Framework.Scenes
2278 { 2279 {
2279 if (part != null) 2280 if (part != null)
2280 { 2281 {
2281 if (part.GetAvatarOnSitTarget() == UUID) 2282 if (part.SitTargetAvatar == UUID)
2282 { 2283 {
2283 Vector3 sitTargetPos = part.SitTargetPosition; 2284 Vector3 sitTargetPos = part.SitTargetPosition;
2284 Quaternion sitTargetOrient = part.SitTargetOrientation; 2285 Quaternion sitTargetOrient = part.SitTargetOrientation;