aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2011-04-30 16:53:11 -0700
committerDiva Canto2011-04-30 16:53:11 -0700
commit00e94b0ba8e22b1bfdcbebc7c3d5c879d22b52a4 (patch)
tree025f47a20ada2f3b5254b2684aced1af1910be72
parentWhen coming in from a legacy region without fatpacks, start scripts the (diff)
downloadopensim-SC_OLD-00e94b0ba8e22b1bfdcbebc7c3d5c879d22b52a4.zip
opensim-SC_OLD-00e94b0ba8e22b1bfdcbebc7c3d5c879d22b52a4.tar.gz
opensim-SC_OLD-00e94b0ba8e22b1bfdcbebc7c3d5c879d22b52a4.tar.bz2
opensim-SC_OLD-00e94b0ba8e22b1bfdcbebc7c3d5c879d22b52a4.tar.xz
Check for RegionID instead of RegionHandle. Other minor tweaks
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
index 7858f2a..f8cea71 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
@@ -179,7 +179,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
179 return true; 179 return true;
180 180
181 // else do the remote thing 181 // else do the remote thing
182 if (!m_localBackend.IsLocalRegion(destination.RegionHandle)) 182 if (!m_localBackend.IsLocalRegion(destination.RegionID))
183 { 183 {
184 return m_remoteConnector.CreateAgent(destination, aCircuit, teleportFlags, out reason); 184 return m_remoteConnector.CreateAgent(destination, aCircuit, teleportFlags, out reason);
185 } 185 }
@@ -241,7 +241,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
241 return true; 241 return true;
242 242
243 // else do the remote thing 243 // else do the remote thing
244 if (!m_localBackend.IsLocalRegion(destination.RegionHandle)) 244 if (!m_localBackend.IsLocalRegion(destination.RegionID))
245 return m_remoteConnector.QueryAccess(destination, id, position, out version, out reason); 245 return m_remoteConnector.QueryAccess(destination, id, position, out version, out reason);
246 246
247 return false; 247 return false;
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 1aac09d..5b86735 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -937,7 +937,7 @@ namespace OpenSim.Region.Framework.Scenes
937 // and it has already rezzed the attachments and started their scripts. 937 // and it has already rezzed the attachments and started their scripts.
938 // We do the following only for non-login agents, because their scripts 938 // We do the following only for non-login agents, because their scripts
939 // haven't started yet. 939 // haven't started yet.
940 if (wasChild) 940 if (wasChild && Attachments != null && Attachments.Count > 0)
941 { 941 {
942 m_log.DebugFormat("[SCENE PRESENCE]: Restarting scripts in attachments..."); 942 m_log.DebugFormat("[SCENE PRESENCE]: Restarting scripts in attachments...");
943 // Resume scripts 943 // Resume scripts