diff options
author | gareth | 2007-03-22 10:11:15 +0000 |
---|---|---|
committer | gareth | 2007-03-22 10:11:15 +0000 |
commit | 7daa3955bc3a1918e40962851f9e8d38597a245e (patch) | |
tree | bee3e1372a7eed0c1b220a8a49f7bee7d29a6b91 /OpenSim.RegionServer/SimConsole.cs | |
parent | Load XML for neighbourinfo from grid (diff) | |
download | opensim-SC-7daa3955bc3a1918e40962851f9e8d38597a245e.zip opensim-SC-7daa3955bc3a1918e40962851f9e8d38597a245e.tar.gz opensim-SC-7daa3955bc3a1918e40962851f9e8d38597a245e.tar.bz2 opensim-SC-7daa3955bc3a1918e40962851f9e8d38597a245e.tar.xz |
brought zircon branch into trunk
Diffstat (limited to '')
-rw-r--r-- | OpenSim.RegionServer/SimConsole.cs (renamed from src/OpenSimConsole.cs) | 22 |
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; | |||
33 | using System.Net; | 33 | using System.Net; |
34 | using libsecondlife; | 34 | using libsecondlife; |
35 | using libsecondlife.Packets; | 35 | using libsecondlife.Packets; |
36 | using ServerConsole; | 36 | using OpenSim.Framework.Console; |
37 | 37 | ||
38 | namespace OpenSim | 38 | namespace OpenSim |
39 | { | 39 | { |
40 | /// <summary> | 40 | /// <summary> |
41 | /// Description of ServerConsole. | 41 | /// Description of ServerConsole. |
42 | /// </summary> | 42 | /// </summary> |
43 | public class MServerConsole : ConsoleBase | 43 | public class SimConsole : ConsoleBase |
44 | { | 44 | { |
45 | 45 | ||
46 | private ConsoleType ConsType; | 46 | private ConsoleType ConsType; |
@@ -57,7 +57,7 @@ namespace OpenSim | |||
57 | // TCP - the port to bind to | 57 | // TCP - the port to bind to |
58 | // Local - param ignored | 58 | // Local - param ignored |
59 | // SimChat - the chat channel to accept commands from | 59 | // SimChat - the chat channel to accept commands from |
60 | public MServerConsole(ConsoleType constype, string sparam, int iparam) { | 60 | public SimConsole(ConsoleType constype, string sparam, int iparam) { |
61 | ConsType = constype; | 61 | ConsType = constype; |
62 | switch(constype) { | 62 | switch(constype) { |
63 | case ConsoleType.Local: | 63 | case ConsoleType.Local: |
@@ -156,11 +156,11 @@ namespace OpenSim | |||
156 | break; | 156 | break; |
157 | 157 | ||
158 | case "regenerate": | 158 | case "regenerate": |
159 | OpenSim_Main.local_world.RegenerateTerrain(); | 159 | OpenSimRoot.Instance.LocalWorld.RegenerateTerrain(); |
160 | break; | 160 | break; |
161 | 161 | ||
162 | case "shutdown": | 162 | case "shutdown": |
163 | OpenSim_Main.Shutdown(); | 163 | OpenSimRoot.Instance.Shutdown(); |
164 | break; | 164 | break; |
165 | } | 165 | } |
166 | return null; | 166 | return null; |
@@ -170,16 +170,16 @@ namespace OpenSim | |||
170 | public override void ShowCommands(string ShowWhat) { | 170 | public override void ShowCommands(string ShowWhat) { |
171 | switch(ShowWhat) { | 171 | switch(ShowWhat) { |
172 | case "uptime": | 172 | case "uptime": |
173 | this.WriteLine("OpenSim has been running since " + OpenSim_Main.sim.startuptime.ToString()); | 173 | this.WriteLine("OpenSim has been running since " + OpenSimRoot.Instance.startuptime.ToString()); |
174 | this.WriteLine("That is " + (DateTime.Now-OpenSim_Main.sim.startuptime).ToString()); | 174 | this.WriteLine("That is " + (DateTime.Now-OpenSimRoot.Instance.startuptime).ToString()); |
175 | break; | 175 | break; |
176 | case "users": | 176 | case "users": |
177 | OpenSim.world.Avatar TempAv; | 177 | OpenSim.world.Avatar TempAv; |
178 | this.WriteLine(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}","Firstname", "Lastname","Agent ID", "Session ID", "Circuit", "IP")); | 178 | this.WriteLine(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}","Firstname", "Lastname","Agent ID", "Session ID", "Circuit", "IP")); |
179 | foreach (libsecondlife.LLUUID UUID in OpenSim_Main.local_world.Entities.Keys) { | 179 | foreach (libsecondlife.LLUUID UUID in OpenSimRoot.Instance.LocalWorld.Entities.Keys) { |
180 | if(OpenSim_Main.local_world.Entities[UUID].ToString()== "OpenSim.world.Avatar") | 180 | if(OpenSimRoot.Instance.LocalWorld.Entities[UUID].ToString()== "OpenSim.world.Avatar") |
181 | { | 181 | { |
182 | TempAv=(OpenSim.world.Avatar)OpenSim_Main.local_world.Entities[UUID]; | 182 | TempAv=(OpenSim.world.Avatar)OpenSimRoot.Instance.LocalWorld.Entities[UUID]; |
183 | 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())); | 183 | 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())); |
184 | } | 184 | } |
185 | } | 185 | } |
@@ -190,7 +190,7 @@ namespace OpenSim | |||
190 | // Displays a prompt to the user and then runs the command they entered | 190 | // Displays a prompt to the user and then runs the command they entered |
191 | public override void MainConsolePrompt() { | 191 | public override void MainConsolePrompt() { |
192 | string[] tempstrarray; | 192 | string[] tempstrarray; |
193 | string tempstr = this.CmdPrompt("OpenSim-" + OpenSim_Main.cfg.RegionHandle.ToString() + " # "); | 193 | string tempstr = this.CmdPrompt("OpenSim-" + OpenSimRoot.Instance.Cfg.RegionHandle.ToString() + " # "); |
194 | tempstrarray = tempstr.Split(' '); | 194 | tempstrarray = tempstr.Split(' '); |
195 | string cmd=tempstrarray[0]; | 195 | string cmd=tempstrarray[0]; |
196 | Array.Reverse(tempstrarray); | 196 | Array.Reverse(tempstrarray); |