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 4b38a2e..b4dbeae 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);
@@ -1206,7 +1206,7 @@ namespace OpenSim
1206 MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z)); 1206 MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z));
1207 } 1207 }
1208 } 1208 }
1209 m_sceneManager.LoadCurrentSceneFromXml(cmdparams[2], generateNewIDS, loadOffset); 1209 m_sceneManager.LoadCurrentSceneFromXml(cmdparams[0], generateNewIDS, loadOffset);
1210 } 1210 }
1211 else 1211 else
1212 { 1212 {