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 ed4b620..1c84e3f 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -436,7 +436,7 @@ namespace OpenSim
436 if (alert != null) 436 if (alert != null)
437 presence.ControllingClient.Kick(alert); 437 presence.ControllingClient.Kick(alert);
438 else 438 else
439 presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n"); 439 presence.ControllingClient.Kick("\nYou have been logged out by an administrator.\n");
440 440
441 // ...and close on our side 441 // ...and close on our side
442 presence.Scene.IncomingCloseAgent(presence.UUID); 442 presence.Scene.IncomingCloseAgent(presence.UUID);
@@ -1061,7 +1061,7 @@ namespace OpenSim
1061 MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z)); 1061 MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z));
1062 } 1062 }
1063 } 1063 }
1064 m_sceneManager.LoadCurrentSceneFromXml(cmdparams[2], generateNewIDS, loadOffset); 1064 m_sceneManager.LoadCurrentSceneFromXml(cmdparams[0], generateNewIDS, loadOffset);
1065 } 1065 }
1066 else 1066 else
1067 { 1067 {