From 0d2a25b4772776865a7ce032e1698bf8f0cc8fb4 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 13 Aug 2014 23:11:32 +0100
Subject: 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.
---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'OpenSim')

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
                         "[SCENE PRESENCE]: Releasing {0} {1} with callback to {2}",
                         client.Name, client.AgentId, m_callbackURI);
 
-                    UUID originID;
-
-                    lock (m_originRegionIDAccessLock)
-                        originID = m_originRegionID;
-
-                    Scene.SimulationService.ReleaseAgent(originID, UUID, m_callbackURI);
+                    Scene.SimulationService.ReleaseAgent(m_originRegionID, UUID, m_callbackURI);
                     m_callbackURI = null;
                 }
     //            else
-- 
cgit v1.1