aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-05-24 01:00:18 +0100
committerJustin Clark-Casey (justincc)2012-05-24 01:00:18 +0100
commit38ce9d45a523db277d3eb4d3ed310b7cd9ca6b43 (patch)
tree826a9d52e428bc3b792e7b80019dd39b5c5c6a24 /OpenSim/Server
parentIf an agent is still registered as 'in transit' by the source region, don't a... (diff)
downloadopensim-SC_OLD-38ce9d45a523db277d3eb4d3ed310b7cd9ca6b43.zip
opensim-SC_OLD-38ce9d45a523db277d3eb4d3ed310b7cd9ca6b43.tar.gz
opensim-SC_OLD-38ce9d45a523db277d3eb4d3ed310b7cd9ca6b43.tar.bz2
opensim-SC_OLD-38ce9d45a523db277d3eb4d3ed310b7cd9ca6b43.tar.xz
Make ISimulationScene.GetScene() used the more efficient region id for lookup rather than the region handle.
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/Handlers/Simulation/AgentHandlers.cs4
-rw-r--r--OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs2
2 files changed, 3 insertions, 3 deletions
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
546 AgentData agent = new AgentData(); 546 AgentData agent = new AgentData();
547 try 547 try
548 { 548 {
549 agent.Unpack(args, m_SimulationService.GetScene(destination.RegionHandle)); 549 agent.Unpack(args, m_SimulationService.GetScene(destination.RegionID));
550 } 550 }
551 catch (Exception ex) 551 catch (Exception ex)
552 { 552 {
@@ -566,7 +566,7 @@ namespace OpenSim.Server.Handlers.Simulation
566 AgentPosition agent = new AgentPosition(); 566 AgentPosition agent = new AgentPosition();
567 try 567 try
568 { 568 {
569 agent.Unpack(args, m_SimulationService.GetScene(destination.RegionHandle)); 569 agent.Unpack(args, m_SimulationService.GetScene(destination.RegionID));
570 } 570 }
571 catch (Exception ex) 571 catch (Exception ex)
572 { 572 {
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
161 if (args.ContainsKey("extra") && args["extra"] != null) 161 if (args.ContainsKey("extra") && args["extra"] != null)
162 extraStr = args["extra"].AsString(); 162 extraStr = args["extra"].AsString();
163 163
164 IScene s = m_SimulationService.GetScene(destination.RegionHandle); 164 IScene s = m_SimulationService.GetScene(destination.RegionID);
165 ISceneObject sog = null; 165 ISceneObject sog = null;
166 try 166 try
167 { 167 {