aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.Framework.Console
diff options
context:
space:
mode:
authorlbsa712007-05-16 17:12:17 +0000
committerlbsa712007-05-16 17:12:17 +0000
commit6056247ac3002808c95d7a1c6671c388920ec2ed (patch)
treecc9c6aa96868ba71dab8cee92f904b51315156c9 /OpenSim.Framework.Console
parentYet more cleanup/refactoring (diff)
downloadopensim-SC_OLD-6056247ac3002808c95d7a1c6671c388920ec2ed.zip
opensim-SC_OLD-6056247ac3002808c95d7a1c6671c388920ec2ed.tar.gz
opensim-SC_OLD-6056247ac3002808c95d7a1c6671c388920ec2ed.tar.bz2
opensim-SC_OLD-6056247ac3002808c95d7a1c6671c388920ec2ed.tar.xz
* removed unused new-login.dat
* cleared up verbose/noverbose/disableOutput douple negation confusion in ConsoleBase * 2d chat radius is now 3d chat sphere * removed unused fast 2d radius calc * added chat type 0xFF : broadcast (no sphere checking) * OpenSimMain now exposes its LocalWorld
Diffstat (limited to 'OpenSim.Framework.Console')
-rw-r--r--OpenSim.Framework.Console/ConsoleBase.cs24
1 files changed, 6 insertions, 18 deletions
diff --git a/OpenSim.Framework.Console/ConsoleBase.cs b/OpenSim.Framework.Console/ConsoleBase.cs
index c72af45..6a1c53c 100644
--- a/OpenSim.Framework.Console/ConsoleBase.cs
+++ b/OpenSim.Framework.Console/ConsoleBase.cs
@@ -19,25 +19,13 @@ namespace OpenSim.Framework.Console
19 StreamWriter Log; 19 StreamWriter Log;
20 public conscmd_callback cmdparser; 20 public conscmd_callback cmdparser;
21 public string componentname; 21 public string componentname;
22 private bool disableOutput; 22 private bool m_silent;
23 23
24 // STUPID HACK ALERT!!!! STUPID HACK ALERT!!!!! 24 public ConsoleBase(string LogFile, string componentname, conscmd_callback cmdparser, bool silent )
25 // constype - the type of console to use (see enum ConsoleType)
26 // sparam - depending on the console type:
27 // TCP - the IP to bind to (127.0.0.1 if blank)
28 // Local - param ignored
29 // and for the iparam:
30 // TCP - the port to bind to
31 // Local - param ignored
32 // LogFile - duh
33 // componentname - which component of the OGS system? (user, asset etc)
34 // cmdparser - a reference to a conscmd_callback object
35
36 public ConsoleBase(string LogFile, string componentname, conscmd_callback cmdparser, bool disableSystemConsole )
37 { 25 {
38 this.componentname = componentname; 26 this.componentname = componentname;
39 this.cmdparser = cmdparser; 27 this.cmdparser = cmdparser;
40 this.disableOutput = disableSystemConsole; 28 this.m_silent = silent;
41 System.Console.WriteLine("ServerConsole.cs - creating new local console"); 29 System.Console.WriteLine("ServerConsole.cs - creating new local console");
42 System.Console.WriteLine("Logs will be saved to current directory in " + LogFile); 30 System.Console.WriteLine("Logs will be saved to current directory in " + LogFile);
43 Log = File.AppendText(LogFile); 31 Log = File.AppendText(LogFile);
@@ -62,7 +50,7 @@ namespace OpenSim.Framework.Console
62 { 50 {
63 Log.WriteLine(format, args); 51 Log.WriteLine(format, args);
64 Log.Flush(); 52 Log.Flush();
65 if(!disableOutput) 53 if(!m_silent)
66 { 54 {
67 System.Console.WriteLine(format, args); 55 System.Console.WriteLine(format, args);
68 } 56 }
@@ -73,7 +61,7 @@ namespace OpenSim.Framework.Console
73 { 61 {
74 Log.WriteLine(format, args); 62 Log.WriteLine(format, args);
75 Log.Flush(); 63 Log.Flush();
76 if (!disableOutput) 64 if (!m_silent)
77 { 65 {
78 System.Console.WriteLine(format, args); 66 System.Console.WriteLine(format, args);
79 } 67 }