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 6796f2b..daae3e6 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -479,7 +479,7 @@ namespace OpenSim | |||
479 | if (alert != null) | 479 | if (alert != null) |
480 | presence.ControllingClient.Kick(alert); | 480 | presence.ControllingClient.Kick(alert); |
481 | else | 481 | else |
482 | presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n"); | 482 | presence.ControllingClient.Kick("\nYou have been logged out by an administrator.\n"); |
483 | 483 | ||
484 | // ...and close on our side | 484 | // ...and close on our side |
485 | presence.Scene.IncomingCloseAgent(presence.UUID); | 485 | presence.Scene.IncomingCloseAgent(presence.UUID); |
@@ -1202,7 +1202,7 @@ namespace OpenSim | |||
1202 | MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z)); | 1202 | MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z)); |
1203 | } | 1203 | } |
1204 | } | 1204 | } |
1205 | m_sceneManager.LoadCurrentSceneFromXml(cmdparams[2], generateNewIDS, loadOffset); | 1205 | m_sceneManager.LoadCurrentSceneFromXml(cmdparams[0], generateNewIDS, loadOffset); |
1206 | } | 1206 | } |
1207 | else | 1207 | else |
1208 | { | 1208 | { |