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 e5b9dcb..92ccb06 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -458,7 +458,7 @@ namespace OpenSim
458 if (alert != null) 458 if (alert != null)
459 presence.ControllingClient.Kick(alert); 459 presence.ControllingClient.Kick(alert);
460 else 460 else
461 presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n"); 461 presence.ControllingClient.Kick("\nYou have been logged out by an administrator.\n");
462 462
463 // ...and close on our side 463 // ...and close on our side
464 presence.Scene.IncomingCloseAgent(presence.UUID); 464 presence.Scene.IncomingCloseAgent(presence.UUID);
@@ -1161,7 +1161,7 @@ namespace OpenSim
1161 MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z)); 1161 MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z));
1162 } 1162 }
1163 } 1163 }
1164 m_sceneManager.LoadCurrentSceneFromXml(cmdparams[2], generateNewIDS, loadOffset); 1164 m_sceneManager.LoadCurrentSceneFromXml(cmdparams[0], generateNewIDS, loadOffset);
1165 } 1165 }
1166 else 1166 else
1167 { 1167 {