From 38ce9d45a523db277d3eb4d3ed310b7cd9ca6b43 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 24 May 2012 01:00:18 +0100
Subject: Make ISimulationScene.GetScene() used the more efficient region id
 for lookup rather than the region handle.

---
 OpenSim/Server/Handlers/Simulation/AgentHandlers.cs  | 4 ++--
 OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Server/Handlers/Simulation')

diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index 5c9be8f..99ae7f0 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -546,7 +546,7 @@ namespace OpenSim.Server.Handlers.Simulation
                 AgentData agent = new AgentData();
                 try
                 {
-                    agent.Unpack(args, m_SimulationService.GetScene(destination.RegionHandle));
+                    agent.Unpack(args, m_SimulationService.GetScene(destination.RegionID));
                 }
                 catch (Exception ex)
                 {
@@ -566,7 +566,7 @@ namespace OpenSim.Server.Handlers.Simulation
                 AgentPosition agent = new AgentPosition();
                 try
                 {
-                    agent.Unpack(args, m_SimulationService.GetScene(destination.RegionHandle));
+                    agent.Unpack(args, m_SimulationService.GetScene(destination.RegionID));
                 }
                 catch (Exception ex)
                 {
diff --git a/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs b/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs
index f0d8f69..a4d03ba 100644
--- a/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs
@@ -161,7 +161,7 @@ namespace OpenSim.Server.Handlers.Simulation
             if (args.ContainsKey("extra") && args["extra"] != null)
                 extraStr = args["extra"].AsString();
 
-            IScene s = m_SimulationService.GetScene(destination.RegionHandle);
+            IScene s = m_SimulationService.GetScene(destination.RegionID);
             ISceneObject sog = null;
             try
             {
-- 
cgit v1.1