aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2013-05-11 16:15:39 +0200
committerMelanie2013-05-11 16:15:39 +0200
commit8ade6fa617f611fc3b470e279e4a5c50177bd5f0 (patch)
treedac075bf2214750471644b4307cbad05e624ad69 /OpenSim
parentRemove dumb "Region found!" message from map search (diff)
downloadopensim-SC_OLD-8ade6fa617f611fc3b470e279e4a5c50177bd5f0.zip
opensim-SC_OLD-8ade6fa617f611fc3b470e279e4a5c50177bd5f0.tar.gz
opensim-SC_OLD-8ade6fa617f611fc3b470e279e4a5c50177bd5f0.tar.bz2
opensim-SC_OLD-8ade6fa617f611fc3b470e279e4a5c50177bd5f0.tar.xz
Refactor to get closer to core
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index b70aeb7..ed867b8 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1114,14 +1114,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1114 ((Scene)(client.Scene)).RequestTeleportLocation( 1114 ((Scene)(client.Scene)).RequestTeleportLocation(
1115 client, regionInfo.RegionHandle, uinfo.HomePosition, uinfo.HomeLookAt, 1115 client, regionInfo.RegionHandle, uinfo.HomePosition, uinfo.HomeLookAt,
1116 (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome)); 1116 (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome));
1117 return true;
1117 } 1118 }
1118 else 1119 else
1119 { 1120 {
1120 // can't find the Home region: Tell viewer and abort 1121 // can't find the Home region: Tell viewer and abort
1121 client.SendTeleportFailed("Your home region could not be found."); 1122 client.SendTeleportFailed("Your home region could not be found.");
1122 return false;
1123 } 1123 }
1124 return true; 1124 return false;
1125 } 1125 }
1126 1126
1127 #endregion 1127 #endregion
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 28fce53..584ffea 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3380,7 +3380,7 @@ namespace OpenSim.Region.Framework.Scenes
3380 { 3380 {
3381 if (EntityTransferModule != null) 3381 if (EntityTransferModule != null)
3382 { 3382 {
3383 EntityTransferModule.TeleportHome(agentId, client); 3383 return EntityTransferModule.TeleportHome(agentId, client);
3384 } 3384 }
3385 else 3385 else
3386 { 3386 {