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 60c130f..ae4aad3 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -456,7 +456,7 @@ namespace OpenSim
456 if (alert != null) 456 if (alert != null)
457 presence.ControllingClient.Kick(alert); 457 presence.ControllingClient.Kick(alert);
458 else 458 else
459 presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n"); 459 presence.ControllingClient.Kick("\nYou have been logged out by an administrator.\n");
460 460
461 // ...and close on our side 461 // ...and close on our side
462 presence.Scene.IncomingCloseAgent(presence.UUID); 462 presence.Scene.IncomingCloseAgent(presence.UUID);
@@ -1170,7 +1170,7 @@ namespace OpenSim
1170 MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z)); 1170 MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z));
1171 } 1171 }
1172 } 1172 }
1173 m_sceneManager.LoadCurrentSceneFromXml(cmdparams[2], generateNewIDS, loadOffset); 1173 m_sceneManager.LoadCurrentSceneFromXml(cmdparams[0], generateNewIDS, loadOffset);
1174 } 1174 }
1175 else 1175 else
1176 { 1176 {