aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorMelanie2010-06-12 19:15:59 +0100
committerMelanie2010-06-12 19:15:59 +0100
commit5e4bee0f3410533461bf6c06349564d734252b22 (patch)
tree5ad0136bd5259a983b3cf42c7d5475632d162431 /OpenSim/Region/CoreModules
parentMerge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va... (diff)
parentChange name of method to better reflect what it does (diff)
downloadopensim-SC_OLD-5e4bee0f3410533461bf6c06349564d734252b22.zip
opensim-SC_OLD-5e4bee0f3410533461bf6c06349564d734252b22.tar.gz
opensim-SC_OLD-5e4bee0f3410533461bf6c06349564d734252b22.tar.bz2
opensim-SC_OLD-5e4bee0f3410533461bf6c06349564d734252b22.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 5e2c04c..3fcc0e8 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1132,7 +1132,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1132 string reason = String.Empty; 1132 string reason = String.Empty;
1133 1133
1134 1134
1135 bool regionAccepted = m_scene.SimulationService.CreateAgent(reg, a, 0, out reason); // m_interregionCommsOut.SendCreateChildAgent(reg.RegionHandle, a, 0, out reason); 1135 bool regionAccepted = m_scene.SimulationService.CreateAgent(reg, a, (uint)TeleportFlags.Default, out reason);
1136 1136
1137 if (regionAccepted && newAgent) 1137 if (regionAccepted && newAgent)
1138 { 1138 {