brought zircon branch into trunk

1 files changed, 11 insertions, 11 deletions

diff --git a/src/OpenSimConsole.cs b/OpenSim.RegionServer/SimConsole.cs
index cf8b648..d6d5e44 100644
--- a/src/OpenSimConsole.cs
+++ b/OpenSim.RegionServer/SimConsole.cs
@@ -33,14 +33,14 @@ using System.IO;
 using System.Net;

 using libsecondlife;

 using libsecondlife.Packets;

-using ServerConsole;

+using OpenSim.Framework.Console;

 

 namespace OpenSim

 {

         /// <summary>

         /// Description of ServerConsole.

         /// </summary>

-        public class MServerConsole : ConsoleBase

+        public class SimConsole : ConsoleBase

         {

                         

                 private ConsoleType ConsType;

@@ -57,7 +57,7 @@ namespace OpenSim
                 //              TCP - the port to bind to

                 //              Local - param ignored

                 //              SimChat - the chat channel to accept commands from

-                public MServerConsole(ConsoleType constype, string sparam, int iparam) {

+                public SimConsole(ConsoleType constype, string sparam, int iparam) {

                         ConsType = constype;

                         switch(constype) {

                                 case ConsoleType.Local:

@@ -156,11 +156,11 @@ namespace OpenSim
                                 break;

                                 

                                 case "regenerate":

-                                OpenSim_Main.local_world.RegenerateTerrain();

+                                OpenSimRoot.Instance.LocalWorld.RegenerateTerrain();

                                 break;

                                 

                                 case "shutdown":

-                                OpenSim_Main.Shutdown();

+                                OpenSimRoot.Instance.Shutdown();

                                 break;

                         }

                         return null;

@@ -170,16 +170,16 @@ namespace OpenSim
                 public override void ShowCommands(string ShowWhat) {

                         switch(ShowWhat) {

                                 case "uptime":

-                                        this.WriteLine("OpenSim has been running since " + OpenSim_Main.sim.startuptime.ToString());

-                                        this.WriteLine("That is " + (DateTime.Now-OpenSim_Main.sim.startuptime).ToString());

+                                        this.WriteLine("OpenSim has been running since " + OpenSimRoot.Instance.startuptime.ToString());

+                                        this.WriteLine("That is " + (DateTime.Now-OpenSimRoot.Instance.startuptime).ToString());

                                         break;

                                 case "users":

                                         OpenSim.world.Avatar TempAv;

                                         this.WriteLine(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}","Firstname", "Lastname","Agent ID", "Session ID", "Circuit", "IP"));

-                                        foreach (libsecondlife.LLUUID UUID in OpenSim_Main.local_world.Entities.Keys) {

-                                                if(OpenSim_Main.local_world.Entities[UUID].ToString()== "OpenSim.world.Avatar")

+                                        foreach (libsecondlife.LLUUID UUID in OpenSimRoot.Instance.LocalWorld.Entities.Keys) {

+                                                if(OpenSimRoot.Instance.LocalWorld.Entities[UUID].ToString()== "OpenSim.world.Avatar")

                                                 {

-                                                        TempAv=(OpenSim.world.Avatar)OpenSim_Main.local_world.Entities[UUID];

+                                                        TempAv=(OpenSim.world.Avatar)OpenSimRoot.Instance.LocalWorld.Entities[UUID];

                                                         this.WriteLine(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}",TempAv.firstname, TempAv.lastname,UUID, TempAv.ControllingClient.SessionID, TempAv.ControllingClient.CircuitCode, TempAv.ControllingClient.userEP.ToString()));

                                                 }

                                         }

@@ -190,7 +190,7 @@ namespace OpenSim
                 // Displays a prompt to the user and then runs the command they entered

                 public override void MainConsolePrompt() {

                         string[] tempstrarray;

-                        string tempstr = this.CmdPrompt("OpenSim-" + OpenSim_Main.cfg.RegionHandle.ToString() + " # ");

+                        string tempstr = this.CmdPrompt("OpenSim-" + OpenSimRoot.Instance.Cfg.RegionHandle.ToString() + " # ");

                         tempstrarray = tempstr.Split(' ');

                         string cmd=tempstrarray[0];

                         Array.Reverse(tempstrarray);