aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSim.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 09958b1..9d3a1cd 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -454,7 +454,7 @@ namespace OpenSim
454 if (alert != null) 454 if (alert != null)
455 presence.ControllingClient.Kick(alert); 455 presence.ControllingClient.Kick(alert);
456 else 456 else
457 presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n"); 457 presence.ControllingClient.Kick("\nYou have been logged out by an administrator.\n");
458 458
459 // ...and close on our side 459 // ...and close on our side
460 presence.Scene.IncomingCloseAgent(presence.UUID); 460 presence.Scene.IncomingCloseAgent(presence.UUID);
@@ -1152,7 +1152,7 @@ namespace OpenSim
1152 MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z)); 1152 MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z));
1153 } 1153 }
1154 } 1154 }
1155 m_sceneManager.LoadCurrentSceneFromXml(cmdparams[2], generateNewIDS, loadOffset); 1155 m_sceneManager.LoadCurrentSceneFromXml(cmdparams[0], generateNewIDS, loadOffset);
1156 } 1156 }
1157 else 1157 else
1158 { 1158 {