diff options
author | lbsa71 | 2007-07-03 14:37:29 +0000 |
---|---|---|
committer | lbsa71 | 2007-07-03 14:37:29 +0000 |
commit | 9b6b6d05d45cf0f754a0b26bf6240ef50be66563 (patch) | |
tree | 8d72120aac2184c5ed4c5ab5f6b673ef496a0803 /OpenSim/Framework/Console | |
parent | * Completed conceptual LlsdMethod - everything resides in SimpleApp pending g... (diff) | |
download | opensim-SC-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.zip opensim-SC-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.gz opensim-SC-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.bz2 opensim-SC-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.xz |
* Optimized usings (the 'LL ate my scripts' commit)
* added some licensing info
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Console/AssemblyInfo.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Console/ConsoleCallbacksBase.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/Console/LogBase.cs | 12 | ||||
-rw-r--r-- | OpenSim/Framework/Console/MainLog.cs | 2 |
4 files changed, 6 insertions, 14 deletions
diff --git a/OpenSim/Framework/Console/AssemblyInfo.cs b/OpenSim/Framework/Console/AssemblyInfo.cs index 8f715d2..30f6167 100644 --- a/OpenSim/Framework/Console/AssemblyInfo.cs +++ b/OpenSim/Framework/Console/AssemblyInfo.cs | |||
@@ -26,9 +26,7 @@ | |||
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System.Reflection; | 28 | using System.Reflection; |
29 | using System.Runtime.CompilerServices; | ||
30 | using System.Runtime.InteropServices; | 29 | using System.Runtime.InteropServices; |
31 | |||
32 | // Information about this assembly is defined by the following | 30 | // Information about this assembly is defined by the following |
33 | // attributes. | 31 | // attributes. |
34 | // | 32 | // |
diff --git a/OpenSim/Framework/Console/ConsoleCallbacksBase.cs b/OpenSim/Framework/Console/ConsoleCallbacksBase.cs index e3847be..346cfe6 100644 --- a/OpenSim/Framework/Console/ConsoleCallbacksBase.cs +++ b/OpenSim/Framework/Console/ConsoleCallbacksBase.cs | |||
@@ -25,10 +25,6 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | |||
32 | namespace OpenSim.Framework.Console | 28 | namespace OpenSim.Framework.Console |
33 | { | 29 | { |
34 | public interface conscmd_callback | 30 | public interface conscmd_callback |
diff --git a/OpenSim/Framework/Console/LogBase.cs b/OpenSim/Framework/Console/LogBase.cs index a4a17e9..f73e15e 100644 --- a/OpenSim/Framework/Console/LogBase.cs +++ b/OpenSim/Framework/Console/LogBase.cs | |||
@@ -120,7 +120,7 @@ namespace OpenSim.Framework.Console | |||
120 | return; | 120 | return; |
121 | } | 121 | } |
122 | 122 | ||
123 | private void WriteNewLine(System.ConsoleColor color, string format, params object[] args) | 123 | private void WriteNewLine(ConsoleColor color, string format, params object[] args) |
124 | { | 124 | { |
125 | Log.WriteLine(format, args); | 125 | Log.WriteLine(format, args); |
126 | Log.Flush(); | 126 | Log.Flush(); |
@@ -132,7 +132,7 @@ namespace OpenSim.Framework.Console | |||
132 | System.Console.WriteLine(format, args); | 132 | System.Console.WriteLine(format, args); |
133 | System.Console.ResetColor(); | 133 | System.Console.ResetColor(); |
134 | } | 134 | } |
135 | catch (System.ArgumentNullException) | 135 | catch (ArgumentNullException) |
136 | { | 136 | { |
137 | // Some older systems dont support coloured text. | 137 | // Some older systems dont support coloured text. |
138 | System.Console.WriteLine(format, args); | 138 | System.Console.WriteLine(format, args); |
@@ -162,14 +162,14 @@ namespace OpenSim.Framework.Console | |||
162 | 162 | ||
163 | while (true) | 163 | while (true) |
164 | { | 164 | { |
165 | addressStr = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt(prompt, defaultvalue); | 165 | addressStr = MainLog.Instance.CmdPrompt(prompt, defaultvalue); |
166 | if (IPAddress.TryParse(addressStr, out address)) | 166 | if (IPAddress.TryParse(addressStr, out address)) |
167 | { | 167 | { |
168 | break; | 168 | break; |
169 | } | 169 | } |
170 | else | 170 | else |
171 | { | 171 | { |
172 | OpenSim.Framework.Console.MainLog.Instance.Error("Illegal address. Please re-enter."); | 172 | MainLog.Instance.Error("Illegal address. Please re-enter."); |
173 | } | 173 | } |
174 | } | 174 | } |
175 | 175 | ||
@@ -183,7 +183,7 @@ namespace OpenSim.Framework.Console | |||
183 | 183 | ||
184 | while (true) | 184 | while (true) |
185 | { | 185 | { |
186 | portStr = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt(prompt, defaultvalue); | 186 | portStr = MainLog.Instance.CmdPrompt(prompt, defaultvalue); |
187 | if (int.TryParse(portStr, out port)) | 187 | if (int.TryParse(portStr, out port)) |
188 | { | 188 | { |
189 | if (port >= IPEndPoint.MinPort && port <= IPEndPoint.MaxPort) | 189 | if (port >= IPEndPoint.MinPort && port <= IPEndPoint.MaxPort) |
@@ -192,7 +192,7 @@ namespace OpenSim.Framework.Console | |||
192 | } | 192 | } |
193 | } | 193 | } |
194 | 194 | ||
195 | OpenSim.Framework.Console.MainLog.Instance.Error("Illegal address. Please re-enter."); | 195 | MainLog.Instance.Error("Illegal address. Please re-enter."); |
196 | } | 196 | } |
197 | 197 | ||
198 | return port; | 198 | return port; |
diff --git a/OpenSim/Framework/Console/MainLog.cs b/OpenSim/Framework/Console/MainLog.cs index d7f945e..7d52622 100644 --- a/OpenSim/Framework/Console/MainLog.cs +++ b/OpenSim/Framework/Console/MainLog.cs | |||
@@ -25,8 +25,6 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System; | ||
29 | |||
30 | namespace OpenSim.Framework.Console | 28 | namespace OpenSim.Framework.Console |
31 | { | 29 | { |
32 | public class MainLog { | 30 | public class MainLog { |