aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs51
1 files changed, 11 insertions, 40 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index d40132e..d354c0a 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1890,7 +1890,7 @@ namespace OpenSim.Region.Framework.Scenes
1890 bool forceMouselook = false; 1890 bool forceMouselook = false;
1891 1891
1892 //SceneObjectPart part = m_scene.GetSceneObjectPart(targetID); 1892 //SceneObjectPart part = m_scene.GetSceneObjectPart(targetID);
1893 SceneObjectPart part = FindNextAvailableSitTarget(targetID); 1893 SceneObjectPart part = FindNextAvailableSitTarget(targetID);
1894 if (part != null) 1894 if (part != null)
1895 { 1895 {
1896 // TODO: determine position to sit at based on scene geometry; don't trust offset from client 1896 // TODO: determine position to sit at based on scene geometry; don't trust offset from client
@@ -1966,14 +1966,23 @@ namespace OpenSim.Region.Framework.Scenes
1966 HandleAgentSit(remoteClient, UUID); 1966 HandleAgentSit(remoteClient, UUID);
1967 } 1967 }
1968 1968
1969 // public void HandleAgentRequestSit(IClientAPI remoteClient, UUID agentID, UUID targetID, Vector3 offset, string sitAnimation)
1969 public void HandleAgentRequestSit(IClientAPI remoteClient, UUID agentID, UUID targetID, Vector3 offset) 1970 public void HandleAgentRequestSit(IClientAPI remoteClient, UUID agentID, UUID targetID, Vector3 offset)
1970 { 1971 {
1971 if (m_parentID != 0) 1972 if (m_parentID != 0)
1972 { 1973 {
1973 StandUp(); 1974 StandUp();
1974 } 1975 }
1976
1977// if (!String.IsNullOrEmpty(sitAnimation))
1978// {
1979// m_nextSitAnimation = sitAnimation;
1980// }
1981// else
1982// {
1975 m_nextSitAnimation = "SIT"; 1983 m_nextSitAnimation = "SIT";
1976 1984// }
1985
1977 //SceneObjectPart part = m_scene.GetSceneObjectPart(targetID); 1986 //SceneObjectPart part = m_scene.GetSceneObjectPart(targetID);
1978 SceneObjectPart part = FindNextAvailableSitTarget(targetID); 1987 SceneObjectPart part = FindNextAvailableSitTarget(targetID);
1979 1988
@@ -1998,7 +2007,6 @@ namespace OpenSim.Region.Framework.Scenes
1998 } 2007 }
1999 else 2008 else
2000 { 2009 {
2001
2002 m_log.Warn("Sit requested on unknown object: " + targetID.ToString()); 2010 m_log.Warn("Sit requested on unknown object: " + targetID.ToString());
2003 } 2011 }
2004 2012
@@ -2196,44 +2204,7 @@ namespace OpenSim.Region.Framework.Scenes
2196 SendSitResponse(ControllingClient, m_requestedSitTargetUUID, collisionPoint - m_requestedSitOffset, Quaternion.Identity); 2204 SendSitResponse(ControllingClient, m_requestedSitTargetUUID, collisionPoint - m_requestedSitOffset, Quaternion.Identity);
2197 } 2205 }
2198 */ 2206 */
2199 public void HandleAgentRequestSit(IClientAPI remoteClient, UUID agentID, UUID targetID, Vector3 offset, string sitAnimation)
2200 {
2201 if (m_parentID != 0)
2202 {
2203 StandUp();
2204 }
2205 if (!String.IsNullOrEmpty(sitAnimation))
2206 {
2207 m_nextSitAnimation = sitAnimation;
2208 }
2209 else
2210 {
2211 m_nextSitAnimation = "SIT";
2212 }
2213 2207
2214 //SceneObjectPart part = m_scene.GetSceneObjectPart(targetID);
2215 SceneObjectPart part = FindNextAvailableSitTarget(targetID);
2216 if (part != null)
2217 {
2218 m_requestedSitTargetID = part.LocalId;
2219 //m_requestedSitOffset = offset;
2220 m_requestedSitTargetUUID = targetID;
2221
2222 m_log.DebugFormat("[SIT]: Client requested Sit Position: {0}", offset);
2223
2224 if (m_scene.PhysicsScene.SupportsRayCast())
2225 {
2226 //SitRayCastAvatarPosition(part);
2227 //return;
2228 }
2229 }
2230 else
2231 {
2232 m_log.Warn("Sit requested on unknown object: " + targetID);
2233 }
2234
2235 SendSitResponse(remoteClient, targetID, offset, Quaternion.Identity);
2236 }
2237 2208
2238 public void HandleAgentSit(IClientAPI remoteClient, UUID agentID) 2209 public void HandleAgentSit(IClientAPI remoteClient, UUID agentID)
2239 { 2210 {