aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSim.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-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 51eb396..7a188fd 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -444,7 +444,7 @@ namespace OpenSim
444 if (alert != null) 444 if (alert != null)
445 presence.ControllingClient.Kick(alert); 445 presence.ControllingClient.Kick(alert);
446 else 446 else
447 presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n"); 447 presence.ControllingClient.Kick("\nYou have been logged out by an administrator.\n");
448 448
449 // ...and close on our side 449 // ...and close on our side
450 presence.Scene.IncomingCloseAgent(presence.UUID); 450 presence.Scene.IncomingCloseAgent(presence.UUID);
@@ -1146,7 +1146,7 @@ namespace OpenSim
1146 MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z)); 1146 MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z));
1147 } 1147 }
1148 } 1148 }
1149 m_sceneManager.LoadCurrentSceneFromXml(cmdparams[2], generateNewIDS, loadOffset); 1149 m_sceneManager.LoadCurrentSceneFromXml(cmdparams[0], generateNewIDS, loadOffset);
1150 } 1150 }
1151 else 1151 else
1152 { 1152 {