diff options
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 3a1a8c7..a1bdfb9 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -478,7 +478,7 @@ namespace OpenSim | |||
478 | if (alert != null) | 478 | if (alert != null) |
479 | presence.ControllingClient.Kick(alert); | 479 | presence.ControllingClient.Kick(alert); |
480 | else | 480 | else |
481 | presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n"); | 481 | presence.ControllingClient.Kick("\nYou have been logged out by an administrator.\n"); |
482 | 482 | ||
483 | // ...and close on our side | 483 | // ...and close on our side |
484 | presence.Scene.IncomingCloseAgent(presence.UUID); | 484 | presence.Scene.IncomingCloseAgent(presence.UUID); |
@@ -1207,7 +1207,7 @@ namespace OpenSim | |||
1207 | MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z)); | 1207 | MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z)); |
1208 | } | 1208 | } |
1209 | } | 1209 | } |
1210 | m_sceneManager.LoadCurrentSceneFromXml(cmdparams[2], generateNewIDS, loadOffset); | 1210 | m_sceneManager.LoadCurrentSceneFromXml(cmdparams[0], generateNewIDS, loadOffset); |
1211 | } | 1211 | } |
1212 | else | 1212 | else |
1213 | { | 1213 | { |