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 ee26e4f..f6ce291 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -470,7 +470,7 @@ namespace OpenSim
470 if (alert != null) 470 if (alert != null)
471 presence.ControllingClient.Kick(alert); 471 presence.ControllingClient.Kick(alert);
472 else 472 else
473 presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n"); 473 presence.ControllingClient.Kick("\nYou have been logged out by an administrator.\n");
474 474
475 // ...and close on our side 475 // ...and close on our side
476 presence.Scene.IncomingCloseAgent(presence.UUID); 476 presence.Scene.IncomingCloseAgent(presence.UUID);
@@ -1181,7 +1181,7 @@ namespace OpenSim
1181 MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z)); 1181 MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z));
1182 } 1182 }
1183 } 1183 }
1184 m_sceneManager.LoadCurrentSceneFromXml(cmdparams[2], generateNewIDS, loadOffset); 1184 m_sceneManager.LoadCurrentSceneFromXml(cmdparams[0], generateNewIDS, loadOffset);
1185 } 1185 }
1186 else 1186 else
1187 { 1187 {