diff options
author | Justin Clark-Casey (justincc) | 2014-08-13 23:11:32 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-08-13 23:11:32 +0100 |
commit | 0d2a25b4772776865a7ce032e1698bf8f0cc8fb4 (patch) | |
tree | 7910ca4314d6ec7e9fa2993805be7c1791bd856d /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | Only set up the UnackedMethod for an outgoing message if that message is actu... (diff) | |
download | opensim-SC_OLD-0d2a25b4772776865a7ce032e1698bf8f0cc8fb4.zip opensim-SC_OLD-0d2a25b4772776865a7ce032e1698bf8f0cc8fb4.tar.gz opensim-SC_OLD-0d2a25b4772776865a7ce032e1698bf8f0cc8fb4.tar.bz2 opensim-SC_OLD-0d2a25b4772776865a7ce032e1698bf8f0cc8fb4.tar.xz |
Remove redundant origin region lock in SP.CompleteMovement()
This is already going to be correctly set by WaitForUpdateAgent() earlier on in that method, which is always called where a callback to the originating region is required.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index e792d3f..5af7513 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1764,12 +1764,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1764 | "[SCENE PRESENCE]: Releasing {0} {1} with callback to {2}", | 1764 | "[SCENE PRESENCE]: Releasing {0} {1} with callback to {2}", |
1765 | client.Name, client.AgentId, m_callbackURI); | 1765 | client.Name, client.AgentId, m_callbackURI); |
1766 | 1766 | ||
1767 | UUID originID; | 1767 | Scene.SimulationService.ReleaseAgent(m_originRegionID, UUID, m_callbackURI); |
1768 | |||
1769 | lock (m_originRegionIDAccessLock) | ||
1770 | originID = m_originRegionID; | ||
1771 | |||
1772 | Scene.SimulationService.ReleaseAgent(originID, UUID, m_callbackURI); | ||
1773 | m_callbackURI = null; | 1768 | m_callbackURI = null; |
1774 | } | 1769 | } |
1775 | // else | 1770 | // else |