aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-07-10 23:26:40 +0100
committerJustin Clark-Casey (justincc)2012-07-10 23:26:40 +0100
commit69a6f6e3cd5cf1146a2d11d1393df0851c051e67 (patch)
tree16dd46e38f172ca7092c897953cc8cc1a3a81c48 /OpenSim/Region/Framework/Scenes
parentMove common code to detect whether a part has a valid sit target into a SOP p... (diff)
downloadopensim-SC_OLD-69a6f6e3cd5cf1146a2d11d1393df0851c051e67.zip
opensim-SC_OLD-69a6f6e3cd5cf1146a2d11d1393df0851c051e67.tar.gz
opensim-SC_OLD-69a6f6e3cd5cf1146a2d11d1393df0851c051e67.tar.bz2
opensim-SC_OLD-69a6f6e3cd5cf1146a2d11d1393df0851c051e67.tar.xz
refactor: use sit orientation argument passed in to SP.SendSitResponse() rather than creating a new copy
There are no issues with side-effects since this is a struct.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs6
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index c644ea5..a8c98ed 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1857,10 +1857,8 @@ namespace OpenSim.Region.Framework.Scenes
1857 return targetPart; 1857 return targetPart;
1858 } 1858 }
1859 1859
1860 private void SendSitResponse(UUID targetID, Vector3 offset, Quaternion pSitOrientation) 1860 private void SendSitResponse(UUID targetID, Vector3 offset, Quaternion sitOrientation)
1861 { 1861 {
1862 Vector3 pos = new Vector3();
1863 Quaternion sitOrientation = pSitOrientation;
1864 Vector3 cameraEyeOffset = Vector3.Zero; 1862 Vector3 cameraEyeOffset = Vector3.Zero;
1865 Vector3 cameraAtOffset = Vector3.Zero; 1863 Vector3 cameraAtOffset = Vector3.Zero;
1866 bool forceMouselook = false; 1864 bool forceMouselook = false;
@@ -1876,7 +1874,7 @@ namespace OpenSim.Region.Framework.Scenes
1876 m_sitAvatarHeight = PhysicsActor.Size.Z; 1874 m_sitAvatarHeight = PhysicsActor.Size.Z;
1877 1875
1878 bool canSit = false; 1876 bool canSit = false;
1879 pos = part.AbsolutePosition + offset; 1877 Vector3 pos = part.AbsolutePosition + offset;
1880 1878
1881 if (part.IsSitTargetSet) 1879 if (part.IsSitTargetSet)
1882 { 1880 {