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 eea008b..e7ee8c4 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -455,7 +455,7 @@ namespace OpenSim
455 if (alert != null) 455 if (alert != null)
456 presence.ControllingClient.Kick(alert); 456 presence.ControllingClient.Kick(alert);
457 else 457 else
458 presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n"); 458 presence.ControllingClient.Kick("\nYou have been logged out by an administrator.\n");
459 459
460 // ...and close on our side 460 // ...and close on our side
461 presence.Scene.IncomingCloseAgent(presence.UUID); 461 presence.Scene.IncomingCloseAgent(presence.UUID);
@@ -1156,7 +1156,7 @@ namespace OpenSim
1156 MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z)); 1156 MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z));
1157 } 1157 }
1158 } 1158 }
1159 m_sceneManager.LoadCurrentSceneFromXml(cmdparams[2], generateNewIDS, loadOffset); 1159 m_sceneManager.LoadCurrentSceneFromXml(cmdparams[0], generateNewIDS, loadOffset);
1160 } 1160 }
1161 else 1161 else
1162 { 1162 {