aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-05-30 19:27:20 +0100
committerJustin Clark-Casey (justincc)2013-05-30 19:27:20 +0100
commit8f9a726465c5bb7528d6ae7d74f20818d4ee3094 (patch)
tree3c6738fe46c2ece1a952c7ec6ccfbb1290eadcbd /OpenSim/Region
parentTry caching the user name for a new agent earlier on in the process of establ... (diff)
downloadopensim-SC_OLD-8f9a726465c5bb7528d6ae7d74f20818d4ee3094.zip
opensim-SC_OLD-8f9a726465c5bb7528d6ae7d74f20818d4ee3094.tar.gz
opensim-SC_OLD-8f9a726465c5bb7528d6ae7d74f20818d4ee3094.tar.bz2
opensim-SC_OLD-8f9a726465c5bb7528d6ae7d74f20818d4ee3094.tar.xz
If on a sit request we sit the avatar on a different prim in a linkset for some reason (e.g. because it has a sit target), then send the actual sit prim UUID to the viewer rather than the requested one.
This purports to fix the issue described in http://opensimulator.org/mantis/view.php?id=6653 where the camera can end up following the requested sit prim rather than the actual. The original spot was by Vegaslon, this commit just goes about it in a slightly different way This commit also makes m_requestedSitTargetUUID to be the actual UUID, which is consistent with m_requestedSitTargetID which was already doing this. However, this adjustment has no practical effect since we only currently need to know that there's any requested sit UUID at all, not which one it is.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index ab7fd5b..e8aa52e 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2138,9 +2138,9 @@ namespace OpenSim.Region.Framework.Scenes
2138 forceMouselook = part.GetForceMouselook(); 2138 forceMouselook = part.GetForceMouselook();
2139 2139
2140 ControllingClient.SendSitResponse( 2140 ControllingClient.SendSitResponse(
2141 targetID, offset, sitOrientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook); 2141 part.UUID, offset, sitOrientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook);
2142 2142
2143 m_requestedSitTargetUUID = targetID; 2143 m_requestedSitTargetUUID = part.UUID;
2144 2144
2145 HandleAgentSit(ControllingClient, UUID); 2145 HandleAgentSit(ControllingClient, UUID);
2146 2146
@@ -2165,7 +2165,7 @@ namespace OpenSim.Region.Framework.Scenes
2165 if (part != null) 2165 if (part != null)
2166 { 2166 {
2167 m_requestedSitTargetID = part.LocalId; 2167 m_requestedSitTargetID = part.LocalId;
2168 m_requestedSitTargetUUID = targetID; 2168 m_requestedSitTargetUUID = part.UUID;
2169 2169
2170// m_log.DebugFormat("[SIT]: Client requested Sit Position: {0}", offset); 2170// m_log.DebugFormat("[SIT]: Client requested Sit Position: {0}", offset);
2171 2171