diff options
author | Justin Clark-Casey (justincc) | 2011-11-11 21:53:00 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-11-11 21:53:00 +0000 |
commit | 2a7f4e0602c1b34a5a3439d767e5c7da388118fa (patch) | |
tree | 39abcadef3986b1441e0846c6bb13ebca18f831d | |
parent | As per mailing list last week, remove facility that would automatically move ... (diff) | |
download | opensim-SC_OLD-2a7f4e0602c1b34a5a3439d767e5c7da388118fa.zip opensim-SC_OLD-2a7f4e0602c1b34a5a3439d767e5c7da388118fa.tar.gz opensim-SC_OLD-2a7f4e0602c1b34a5a3439d767e5c7da388118fa.tar.bz2 opensim-SC_OLD-2a7f4e0602c1b34a5a3439d767e5c7da388118fa.tar.xz |
remove unncessary IClientAPI parameter from SP.SendSitResponse()
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 6979d2e..0c20045 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1927,7 +1927,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1927 | return targetPart; | 1927 | return targetPart; |
1928 | } | 1928 | } |
1929 | 1929 | ||
1930 | private void SendSitResponse(IClientAPI remoteClient, UUID targetID, Vector3 offset, Quaternion pSitOrientation) | 1930 | private void SendSitResponse(UUID targetID, Vector3 offset, Quaternion pSitOrientation) |
1931 | { | 1931 | { |
1932 | Vector3 pos = new Vector3(); | 1932 | Vector3 pos = new Vector3(); |
1933 | Quaternion sitOrientation = pSitOrientation; | 1933 | Quaternion sitOrientation = pSitOrientation; |
@@ -2009,7 +2009,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2009 | 2009 | ||
2010 | m_requestedSitTargetUUID = targetID; | 2010 | m_requestedSitTargetUUID = targetID; |
2011 | 2011 | ||
2012 | HandleAgentSit(remoteClient, UUID); | 2012 | HandleAgentSit(ControllingClient, UUID); |
2013 | 2013 | ||
2014 | // Moved here to avoid a race with default sit anim | 2014 | // Moved here to avoid a race with default sit anim |
2015 | // The script event needs to be raised after the default sit anim is set. | 2015 | // The script event needs to be raised after the default sit anim is set. |
@@ -2017,7 +2017,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2017 | } | 2017 | } |
2018 | } | 2018 | } |
2019 | 2019 | ||
2020 | // public void HandleAgentRequestSit(IClientAPI remoteClient, UUID agentID, UUID targetID, Vector3 offset, string sitAnimation) | ||
2021 | public void HandleAgentRequestSit(IClientAPI remoteClient, UUID agentID, UUID targetID, Vector3 offset) | 2020 | public void HandleAgentRequestSit(IClientAPI remoteClient, UUID agentID, UUID targetID, Vector3 offset) |
2022 | { | 2021 | { |
2023 | if (ParentID != 0) | 2022 | if (ParentID != 0) |
@@ -2061,7 +2060,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2061 | m_log.Warn("Sit requested on unknown object: " + targetID.ToString()); | 2060 | m_log.Warn("Sit requested on unknown object: " + targetID.ToString()); |
2062 | } | 2061 | } |
2063 | 2062 | ||
2064 | SendSitResponse(remoteClient, targetID, offset, Quaternion.Identity); | 2063 | SendSitResponse(targetID, offset, Quaternion.Identity); |
2065 | } | 2064 | } |
2066 | 2065 | ||
2067 | /* | 2066 | /* |