aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2009-05-20 13:50:33 +0000
committerMelanie Thielker2009-05-20 13:50:33 +0000
commit4065ebff15e228d7227500f3a2275025f5d16966 (patch)
tree3ffddea94c9fab8218289c5bc4e188e9f52a53c2
parentrefactoring instantiation of Location object: moving it out of the for (diff)
downloadopensim-SC_OLD-4065ebff15e228d7227500f3a2275025f5d16966.zip
opensim-SC_OLD-4065ebff15e228d7227500f3a2275025f5d16966.tar.gz
opensim-SC_OLD-4065ebff15e228d7227500f3a2275025f5d16966.tar.bz2
opensim-SC_OLD-4065ebff15e228d7227500f3a2275025f5d16966.tar.xz
Remove the pre-log4net, discrete output methods from the consoles
Diffstat
-rw-r--r--OpenSim/Framework/Console/ConsoleBase.cs148
-rw-r--r--OpenSim/Framework/Console/ConsolePluginCommand.cs2
-rw-r--r--OpenSim/Framework/Console/LocalConsole.cs124
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs2
-rw-r--r--OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs2
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs2
-rw-r--r--OpenSim/Grid/GridServer/GridServerBase.cs2
-rw-r--r--OpenSim/Grid/InventoryServer/Main.cs2
-rw-r--r--OpenSim/Grid/MessagingServer/Main.cs6
-rw-r--r--OpenSim/Grid/UserServer/Main.cs4
-rw-r--r--OpenSim/Region/Application/OpenSim.cs85
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs2
-rw-r--r--OpenSim/Server/Base/HttpServerBase.cs4
-rw-r--r--OpenSim/Server/Base/ServicesServerBase.cs5
-rw-r--r--OpenSim/TestSuite/PhysicsBot.cs2
-rw-r--r--OpenSim/Tools/pCampBot/BotManager.cs2
-rw-r--r--OpenSim/Tools/pCampBot/PhysicsBot.cs16
17 files changed, 73 insertions, 337 deletions
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index dd3c145..0747ae5 100644
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -58,154 +58,6 @@ namespace OpenSim.Framework.Console
58 DefaultPrompt = defaultPrompt; 58 DefaultPrompt = defaultPrompt;
59 } 59 }
60 60
61 /// <summary>
62 /// derive an ansi color from a string, ignoring the darker colors.
63 /// This is used to help automatically bin component tags with colors
64 /// in various print functions.
65 /// </summary>
66 /// <param name="input">arbitrary string for input</param>
67 /// <returns>an ansii color</returns>
68 protected virtual ConsoleColor DeriveColor(string input)
69 {
70 return ConsoleColor.White;
71 }
72
73 /// <summary>
74 /// Sends a warning to the current console output
75 /// </summary>
76 /// <param name="format">The message to send</param>
77 /// <param name="args">WriteLine-style message arguments</param>
78 public void Warn(string format, params object[] args)
79 {
80 WriteNewLine(ConsoleColor.Yellow, format, args);
81 }
82
83 /// <summary>
84 /// Sends a warning to the current console output
85 /// </summary>
86 /// <param name="sender">The module that sent this message</param>
87 /// <param name="format">The message to send</param>
88 /// <param name="args">WriteLine-style message arguments</param>
89 public void Warn(string sender, string format, params object[] args)
90 {
91 WriteNewLine(DeriveColor(sender), sender, ConsoleColor.Yellow, format, args);
92 }
93
94 /// <summary>
95 /// Sends a notice to the current console output
96 /// </summary>
97 /// <param name="format">The message to send</param>
98 /// <param name="args">WriteLine-style message arguments</param>
99 public void Notice(string format, params object[] args)
100 {
101 WriteNewLine(ConsoleColor.White, format, args);
102 }
103
104 /// <summary>
105 /// Sends a notice to the current console output
106 /// </summary>
107 /// <param name="sender">The module that sent this message</param>
108 /// <param name="format">The message to send</param>
109 /// <param name="args">WriteLine-style message arguments</param>
110 public void Notice(string sender, string format, params object[] args)
111 {
112 WriteNewLine(DeriveColor(sender), sender, ConsoleColor.White, format, args);
113 }
114 /// <summary>
115 /// Sends an error to the current console output
116 /// </summary>
117 /// <param name="format">The message to send</param>
118 /// <param name="args">WriteLine-style message arguments</param>
119 public void Error(string format, params object[] args)
120 {
121 WriteNewLine(ConsoleColor.Red, format, args);
122 }
123
124 /// <summary>
125 /// Sends an error to the current console output
126 /// </summary>
127 /// <param name="sender">The module that sent this message</param>
128 /// <param name="format">The message to send</param>
129 /// <param name="args">WriteLine-style message arguments</param>
130 public void Error(string sender, string format, params object[] args)
131 {
132 WriteNewLine(DeriveColor(sender), sender, ConsoleColor.Red, format, args);
133 }
134
135 /// <summary>
136 /// Sends a status message to the current console output
137 /// </summary>
138 /// <param name="format">The message to send</param>
139 /// <param name="args">WriteLine-style message arguments</param>
140 public void Status(string format, params object[] args)
141 {
142 WriteNewLine(ConsoleColor.Blue, format, args);
143 }
144
145 /// <summary>
146 /// Sends a status message to the current console output
147 /// </summary>
148 /// <param name="sender">The module that sent this message</param>
149 /// <param name="format">The message to send</param>
150 /// <param name="args">WriteLine-style message arguments</param>
151 public void Status(string sender, string format, params object[] args)
152 {
153 WriteNewLine(DeriveColor(sender), sender, ConsoleColor.Blue, format, args);
154 }
155
156 [Conditional("DEBUG")]
157 public void Debug(string format, params object[] args)
158 {
159 WriteNewLine(ConsoleColor.Gray, format, args);
160 }
161
162 [Conditional("DEBUG")]
163 public void Debug(string sender, string format, params object[] args)
164 {
165 WriteNewLine(DeriveColor(sender), sender, ConsoleColor.Gray, format, args);
166 }
167
168 protected virtual void WriteNewLine(ConsoleColor senderColor, string sender, ConsoleColor color, string format, params object[] args)
169 {
170 WritePrefixLine(senderColor, sender);
171 WriteConsoleLine(color, format, args);
172 }
173
174 protected virtual void WriteNewLine(ConsoleColor color, string format, params object[] args)
175 {
176 WriteConsoleLine(color, format, args);
177 }
178
179 protected virtual void WriteConsoleLine(ConsoleColor color, string format, params object[] args)
180 {
181 try
182 {
183 System.Console.WriteLine(format, args);
184 }
185 catch (ObjectDisposedException)
186 {
187 }
188 }
189
190 protected virtual void WritePrefixLine(ConsoleColor color, string sender)
191 {
192 try
193 {
194 sender = sender.ToUpper();
195
196 System.Console.WriteLine("[" + sender + "] ");
197
198 System.Console.Write("[");
199
200 System.Console.Write(sender);
201
202 System.Console.Write("] \t");
203 }
204 catch (ObjectDisposedException)
205 {
206 }
207 }
208
209 public virtual void LockOutput() 61 public virtual void LockOutput()
210 { 62 {
211 } 63 }
diff --git a/OpenSim/Framework/Console/ConsolePluginCommand.cs b/OpenSim/Framework/Console/ConsolePluginCommand.cs
index bf70645..8b87239 100644
--- a/OpenSim/Framework/Console/ConsolePluginCommand.cs
+++ b/OpenSim/Framework/Console/ConsolePluginCommand.cs
@@ -124,7 +124,7 @@ namespace OpenSim.Framework.Console
124 /// </summary> 124 /// </summary>
125 public void ShowHelp(ConsoleBase console) 125 public void ShowHelp(ConsoleBase console)
126 { 126 {
127 console.Notice(String.Join(" ", m_cmdText) + " - " + m_helpText); 127 console.Output(String.Join(" ", m_cmdText) + " - " + m_helpText);
128 } 128 }
129 129
130 /// <summary> 130 /// <summary>
diff --git a/OpenSim/Framework/Console/LocalConsole.cs b/OpenSim/Framework/Console/LocalConsole.cs
index 22f10fc..ca57bd6 100644
--- a/OpenSim/Framework/Console/LocalConsole.cs
+++ b/OpenSim/Framework/Console/LocalConsole.cs
@@ -62,19 +62,6 @@ namespace OpenSim.Framework.Console
62 history.Add(text); 62 history.Add(text);
63 } 63 }
64 64
65 /// <summary>
66 /// derive an ansi color from a string, ignoring the darker colors.
67 /// This is used to help automatically bin component tags with colors
68 /// in various print functions.
69 /// </summary>
70 /// <param name="input">arbitrary string for input</param>
71 /// <returns>an ansii color</returns>
72 protected override ConsoleColor DeriveColor(string input)
73 {
74 int colIdx = (input.ToUpper().GetHashCode() % 6) + 9;
75 return (ConsoleColor) colIdx;
76 }
77
78 private int SetCursorTop(int top) 65 private int SetCursorTop(int top)
79 { 66 {
80 if (top >= 0 && top < System.Console.BufferHeight) 67 if (top >= 0 && top < System.Console.BufferHeight)
@@ -101,117 +88,6 @@ namespace OpenSim.Framework.Console
101 } 88 }
102 } 89 }
103 90
104 protected override void WriteNewLine(ConsoleColor senderColor, string sender, ConsoleColor color, string format, params object[] args)
105 {
106 lock (cmdline)
107 {
108 if (y != -1)
109 {
110 y=SetCursorTop(y);
111 System.Console.CursorLeft = 0;
112
113 int count = cmdline.Length;
114
115 System.Console.Write(" ");
116 while (count-- > 0)
117 System.Console.Write(" ");
118
119 y=SetCursorTop(y);
120 System.Console.CursorLeft = 0;
121 }
122 WritePrefixLine(senderColor, sender);
123 WriteConsoleLine(color, format, args);
124 if (y != -1)
125 y = System.Console.CursorTop;
126 }
127 }
128
129 protected override void WriteNewLine(ConsoleColor color, string format, params object[] args)
130 {
131 lock (cmdline)
132 {
133 if (y != -1)
134 {
135 y=SetCursorTop(y);
136 System.Console.CursorLeft = 0;
137
138 int count = cmdline.Length;
139
140 System.Console.Write(" ");
141 while (count-- > 0)
142 System.Console.Write(" ");
143
144 y=SetCursorTop(y);
145 System.Console.CursorLeft = 0;
146 }
147 WriteConsoleLine(color, format, args);
148 if (y != -1)
149 y = System.Console.CursorTop;
150 }
151 }
152
153 protected override void WriteConsoleLine(ConsoleColor color, string format, params object[] args)
154 {
155 try
156 {
157 lock (m_syncRoot)
158 {
159 try
160 {
161 if (color != ConsoleColor.White)
162 System.Console.ForegroundColor = color;
163
164 System.Console.WriteLine(format, args);
165 System.Console.ResetColor();
166 }
167 catch (ArgumentNullException)
168 {
169 // Some older systems dont support coloured text.
170 System.Console.WriteLine(format, args);
171 }
172 catch (FormatException)
173 {
174 System.Console.WriteLine(args);
175 }
176 }
177 }
178 catch (ObjectDisposedException)
179 {
180 }
181 }
182
183 protected override void WritePrefixLine(ConsoleColor color, string sender)
184 {
185 try
186 {
187 lock (m_syncRoot)
188 {
189 sender = sender.ToUpper();
190
191 System.Console.WriteLine("[" + sender + "] ");
192
193 System.Console.Write("[");
194
195 try
196 {
197 System.Console.ForegroundColor = color;
198 System.Console.Write(sender);
199 System.Console.ResetColor();
200 }
201 catch (ArgumentNullException)
202 {
203 // Some older systems dont support coloured text.
204 System.Console.WriteLine(sender);
205 }
206
207 System.Console.Write("] \t");
208 }
209 }
210 catch (ObjectDisposedException)
211 {
212 }
213 }
214
215 private void Show() 91 private void Show()
216 { 92 {
217 lock (cmdline) 93 lock (cmdline)
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index d8a22b1..be769bf 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -411,7 +411,7 @@ namespace OpenSim.Framework.Servers
411 { 411 {
412 if (m_console != null) 412 if (m_console != null)
413 { 413 {
414 m_console.Notice(msg); 414 m_console.Output(msg);
415 } 415 }
416 } 416 }
417 417
diff --git a/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs b/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs
index 0b58825..16b9d9e 100644
--- a/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs
+++ b/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs
@@ -119,7 +119,7 @@ namespace OpenSim.Grid.AssetInventoryServer
119 119
120 public void Work() 120 public void Work()
121 { 121 {
122 m_console.Notice("Enter help for a list of commands"); 122 m_console.Output("Enter help for a list of commands");
123 123
124 while (true) 124 while (true)
125 { 125 {
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 4a4910d..e309273 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Grid.AssetServer
67 67
68 private void Work() 68 private void Work()
69 { 69 {
70 m_console.Notice("Enter help for a list of commands"); 70 m_console.Output("Enter help for a list of commands");
71 71
72 while (true) 72 while (true)
73 { 73 {
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index 67bef2e..6f47304 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Grid.GridServer
61 61
62 public void Work() 62 public void Work()
63 { 63 {
64 m_console.Notice("Enter help for a list of commands\n"); 64 m_console.Output("Enter help for a list of commands\n");
65 65
66 while (true) 66 while (true)
67 { 67 {
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs
index 7891965..7560383 100644
--- a/OpenSim/Grid/InventoryServer/Main.cs
+++ b/OpenSim/Grid/InventoryServer/Main.cs
@@ -164,7 +164,7 @@ namespace OpenSim.Grid.InventoryServer
164 164
165 private void Work() 165 private void Work()
166 { 166 {
167 m_console.Notice("Enter help for a list of commands\n"); 167 m_console.Output("Enter help for a list of commands\n");
168 168
169 while (true) 169 while (true)
170 { 170 {
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index 2b809f9..7e4a2cb 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -76,7 +76,7 @@ namespace OpenSim.Grid.MessagingServer
76 76
77 private void Work() 77 private void Work()
78 { 78 {
79 m_console.Notice("Enter help for a list of commands\n"); 79 m_console.Output("Enter help for a list of commands\n");
80 80
81 while (true) 81 while (true)
82 { 82 {
@@ -120,7 +120,7 @@ namespace OpenSim.Grid.MessagingServer
120 m_httpServer.Stop(); 120 m_httpServer.Stop();
121 m_httpServer = null; 121 m_httpServer = null;
122 } 122 }
123 m_console.Notice("[SERVER]: Deregistered from userserver."); 123 m_console.Output("[SERVER]: Deregistered from userserver.");
124 } 124 }
125 125
126 protected override void StartupSpecific() 126 protected override void StartupSpecific()
@@ -192,7 +192,7 @@ namespace OpenSim.Grid.MessagingServer
192 private void HandleClearCache(string module, string[] cmd) 192 private void HandleClearCache(string module, string[] cmd)
193 { 193 {
194 int entries = m_regionModule.ClearRegionCache(); 194 int entries = m_regionModule.ClearRegionCache();
195 m_console.Notice("Region cache cleared! Cleared " + 195 m_console.Output("Region cache cleared! Cleared " +
196 entries.ToString() + " entries"); 196 entries.ToString() + " entries");
197 } 197 }
198 198
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index b1f1787..7bb8b12 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -91,7 +91,7 @@ namespace OpenSim.Grid.UserServer
91 91
92 public void Work() 92 public void Work()
93 { 93 {
94 m_console.Notice("Enter help for a list of commands\n"); 94 m_console.Output("Enter help for a list of commands\n");
95 95
96 while (true) 96 while (true)
97 { 97 {
@@ -280,7 +280,7 @@ namespace OpenSim.Grid.UserServer
280 280
281 public void TestResponse(List<InventoryFolderBase> resp) 281 public void TestResponse(List<InventoryFolderBase> resp)
282 { 282 {
283 m_console.Notice("response got"); 283 m_console.Output("response got");
284 } 284 }
285 } 285 }
286} 286}
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 282963c..6c1fee5 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -357,7 +357,7 @@ namespace OpenSim
357 if (presence.Firstname.ToLower().Contains(cmdparams[2].ToLower()) && 357 if (presence.Firstname.ToLower().Contains(cmdparams[2].ToLower()) &&
358 presence.Lastname.ToLower().Contains(cmdparams[3].ToLower())) 358 presence.Lastname.ToLower().Contains(cmdparams[3].ToLower()))
359 { 359 {
360 m_console.Notice( 360 m_log.Info(
361 String.Format( 361 String.Format(
362 "Kicking user: {0,-16}{1,-16}{2,-37} in region: {3,-16}", 362 "Kicking user: {0,-16}{1,-16}{2,-37} in region: {3,-16}",
363 presence.Firstname, presence.Lastname, presence.UUID, regionInfo.RegionName)); 363 presence.Firstname, presence.Lastname, presence.UUID, regionInfo.RegionName));
@@ -372,7 +372,7 @@ namespace OpenSim
372 presence.Scene.IncomingCloseAgent(presence.UUID); 372 presence.Scene.IncomingCloseAgent(presence.UUID);
373 } 373 }
374 } 374 }
375 m_console.Notice(""); 375 m_log.Info("");
376 } 376 }
377 377
378 /// <summary> 378 /// <summary>
@@ -418,7 +418,7 @@ namespace OpenSim
418 418
419 private void HandleForceUpdate(string module, string[] args) 419 private void HandleForceUpdate(string module, string[] args)
420 { 420 {
421 m_console.Notice("Updating all clients"); 421 m_log.Info("Updating all clients");
422 m_sceneManager.ForceCurrentSceneClientUpdate(); 422 m_sceneManager.ForceCurrentSceneClientUpdate();
423 } 423 }
424 424
@@ -430,7 +430,7 @@ namespace OpenSim
430 } 430 }
431 else 431 else
432 { 432 {
433 m_console.Notice("Argument error: edit scale <prim name> <x> <y> <z>"); 433 m_log.Info("Argument error: edit scale <prim name> <x> <y> <z>");
434 } 434 }
435 } 435 }
436 436
@@ -438,7 +438,7 @@ namespace OpenSim
438 { 438 {
439 if (cmd.Length < 4 || !cmd[3].EndsWith(".xml")) 439 if (cmd.Length < 4 || !cmd[3].EndsWith(".xml"))
440 { 440 {
441 m_console.Error("Usage: create region <region name> <region_file.xml>"); 441 m_log.Error("Usage: create region <region name> <region_file.xml>");
442 return; 442 return;
443 } 443 }
444 444
@@ -485,8 +485,8 @@ namespace OpenSim
485 case "set": 485 case "set":
486 if (cmdparams.Length < 4) 486 if (cmdparams.Length < 4)
487 { 487 {
488 m_console.Error(n, "SYNTAX: " + n + " SET SECTION KEY VALUE"); 488 m_log.Error("SYNTAX: " + n + " SET SECTION KEY VALUE");
489 m_console.Error(n, "EXAMPLE: " + n + " SET ScriptEngine.DotNetEngine NumberOfScriptThreads 5"); 489 m_log.Error("EXAMPLE: " + n + " SET ScriptEngine.DotNetEngine NumberOfScriptThreads 5");
490 } 490 }
491 else 491 else
492 { 492 {
@@ -502,7 +502,7 @@ namespace OpenSim
502 c.Set(cmdparams[2], _value); 502 c.Set(cmdparams[2], _value);
503 m_config.Source.Merge(source); 503 m_config.Source.Merge(source);
504 504
505 m_console.Error(n, n + " " + n + " " + cmdparams[1] + " " + cmdparams[2] + " " + 505 m_log.Error(n + " " + n + " " + cmdparams[1] + " " + cmdparams[2] + " " +
506 _value); 506 _value);
507 } 507 }
508 } 508 }
@@ -511,20 +511,20 @@ namespace OpenSim
511 case "get": 511 case "get":
512 if (cmdparams.Length < 3) 512 if (cmdparams.Length < 3)
513 { 513 {
514 m_console.Error(n, "SYNTAX: " + n + " GET SECTION KEY"); 514 m_log.Error("SYNTAX: " + n + " GET SECTION KEY");
515 m_console.Error(n, "EXAMPLE: " + n + " GET ScriptEngine.DotNetEngine NumberOfScriptThreads"); 515 m_log.Error("EXAMPLE: " + n + " GET ScriptEngine.DotNetEngine NumberOfScriptThreads");
516 } 516 }
517 else 517 else
518 { 518 {
519 IConfig c = m_config.Source.Configs[cmdparams[1]]; // DefaultConfig().Configs[cmdparams[1]]; 519 IConfig c = m_config.Source.Configs[cmdparams[1]]; // DefaultConfig().Configs[cmdparams[1]];
520 if (c == null) 520 if (c == null)
521 { 521 {
522 m_console.Notice(n, "Section \"" + cmdparams[1] + "\" does not exist."); 522 m_log.Info("Section \"" + cmdparams[1] + "\" does not exist.");
523 break; 523 break;
524 } 524 }
525 else 525 else
526 { 526 {
527 m_console.Notice(n + " GET " + cmdparams[1] + " " + cmdparams[2] + ": " + 527 m_log.Info(n + " GET " + cmdparams[1] + " " + cmdparams[2] + ": " +
528 c.GetString(cmdparams[2])); 528 c.GetString(cmdparams[2]));
529 } 529 }
530 } 530 }
@@ -532,7 +532,7 @@ namespace OpenSim
532 break; 532 break;
533 533
534 case "save": 534 case "save":
535 m_console.Notice("Saving configuration file: " + Application.iniFilePath); 535 m_log.Info("Saving configuration file: " + Application.iniFilePath);
536 m_config.Save(Application.iniFilePath); 536 m_config.Save(Application.iniFilePath);
537 break; 537 break;
538 } 538 }
@@ -552,7 +552,7 @@ namespace OpenSim
552 case "list": 552 case "list":
553 foreach (IRegionModule irm in m_moduleLoader.GetLoadedSharedModules) 553 foreach (IRegionModule irm in m_moduleLoader.GetLoadedSharedModules)
554 { 554 {
555 m_console.Notice("Shared region module: " + irm.Name); 555 m_log.Info("Shared region module: " + irm.Name);
556 } 556 }
557 break; 557 break;
558 case "unload": 558 case "unload":
@@ -562,7 +562,7 @@ namespace OpenSim
562 { 562 {
563 if (rm.Name.ToLower() == cmdparams[1].ToLower()) 563 if (rm.Name.ToLower() == cmdparams[1].ToLower())
564 { 564 {
565 m_console.Notice("Unloading module: " + rm.Name); 565 m_log.Info("Unloading module: " + rm.Name);
566 m_moduleLoader.UnloadModule(rm); 566 m_moduleLoader.UnloadModule(rm);
567 } 567 }
568 } 568 }
@@ -573,7 +573,7 @@ namespace OpenSim
573 { 573 {
574 foreach (Scene s in new ArrayList(m_sceneManager.Scenes)) 574 foreach (Scene s in new ArrayList(m_sceneManager.Scenes))
575 { 575 {
576 m_console.Notice("Loading module: " + cmdparams[1]); 576 m_log.Info("Loading module: " + cmdparams[1]);
577 m_moduleLoader.LoadRegionModules(cmdparams[1], s); 577 m_moduleLoader.LoadRegionModules(cmdparams[1], s);
578 } 578 }
579 } 579 }
@@ -618,7 +618,7 @@ namespace OpenSim
618 if (m_sceneManager.TryGetScene(regRemoveName, out removeScene)) 618 if (m_sceneManager.TryGetScene(regRemoveName, out removeScene))
619 RemoveRegion(removeScene, false); 619 RemoveRegion(removeScene, false);
620 else 620 else
621 m_console.Error("no region with that name"); 621 m_log.Error("no region with that name");
622 break; 622 break;
623 623
624 case "delete-region": 624 case "delete-region":
@@ -628,7 +628,7 @@ namespace OpenSim
628 if (m_sceneManager.TryGetScene(regDeleteName, out killScene)) 628 if (m_sceneManager.TryGetScene(regDeleteName, out killScene))
629 RemoveRegion(killScene, true); 629 RemoveRegion(killScene, true);
630 else 630 else
631 m_console.Error("no region with that name"); 631 m_log.Error("no region with that name");
632 break; 632 break;
633 633
634 case "restart": 634 case "restart":
@@ -672,15 +672,15 @@ namespace OpenSim
672 string newRegionName = CombineParams(cmdparams, 2); 672 string newRegionName = CombineParams(cmdparams, 2);
673 673
674 if (!m_sceneManager.TrySetCurrentScene(newRegionName)) 674 if (!m_sceneManager.TrySetCurrentScene(newRegionName))
675 m_console.Error("Couldn't select region " + newRegionName); 675 m_log.Error("Couldn't select region " + newRegionName);
676 } 676 }
677 else 677 else
678 { 678 {
679 m_console.Error("Usage: change region <region name>"); 679 m_log.Error("Usage: change region <region name>");
680 } 680 }
681 681
682 string regionName = (m_sceneManager.CurrentScene == null ? "root" : m_sceneManager.CurrentScene.RegionInfo.RegionName); 682 string regionName = (m_sceneManager.CurrentScene == null ? "root" : m_sceneManager.CurrentScene.RegionInfo.RegionName);
683 m_console.Notice(String.Format("Currently selected region is {0}", regionName)); 683 m_log.Info(String.Format("Currently selected region is {0}", regionName));
684 m_console.DefaultPrompt = String.Format("Region ({0}) ", regionName); 684 m_console.DefaultPrompt = String.Format("Region ({0}) ", regionName);
685 m_console.ConsoleScene = m_sceneManager.CurrentScene; 685 m_console.ConsoleScene = m_sceneManager.CurrentScene;
686 } 686 }
@@ -697,7 +697,7 @@ namespace OpenSim
697 } 697 }
698 else 698 else
699 { 699 {
700 m_console.Notice("Create user is not available in grid mode, use the user server."); 700 m_log.Info("Create user is not available in grid mode, use the user server.");
701 } 701 }
702 } 702 }
703 703
@@ -713,7 +713,7 @@ namespace OpenSim
713 } 713 }
714 else 714 else
715 { 715 {
716 m_console.Notice("Reset user password is not available in grid mode, use the user-server."); 716 m_log.Info("Reset user password is not available in grid mode, use the user-server.");
717 } 717 }
718 } 718 }
719 719
@@ -738,9 +738,9 @@ namespace OpenSim
738 } 738 }
739 else 739 else
740 { 740 {
741 m_console.Error("packet debug should be 0..255"); 741 m_log.Error("packet debug should be 0..255");
742 } 742 }
743 m_console.Notice("New packet debug: " + newDebug.ToString()); 743 m_log.Info("New packet debug: " + newDebug.ToString());
744 } 744 }
745 745
746 break; 746 break;
@@ -750,7 +750,7 @@ namespace OpenSim
750 { 750 {
751 if (m_sceneManager.CurrentScene == null) 751 if (m_sceneManager.CurrentScene == null)
752 { 752 {
753 m_console.Notice("Please use 'change region <regioname>' first"); 753 m_log.Info("Please use 'change region <regioname>' first");
754 } 754 }
755 else 755 else
756 { 756 {
@@ -759,8 +759,7 @@ namespace OpenSim
759 bool physicsOn = !Convert.ToBoolean(args[4]); 759 bool physicsOn = !Convert.ToBoolean(args[4]);
760 m_sceneManager.CurrentScene.SetSceneCoreDebug(scriptingOn, collisionsOn, physicsOn); 760 m_sceneManager.CurrentScene.SetSceneCoreDebug(scriptingOn, collisionsOn, physicsOn);
761 761
762 m_console.Notice( 762 m_log.Info(
763 "CONSOLE",
764 String.Format( 763 String.Format(
765 "Set debug scene scripting = {0}, collisions = {1}, physics = {2}", 764 "Set debug scene scripting = {0}, collisions = {1}, physics = {2}",
766 !scriptingOn, !collisionsOn, !physicsOn)); 765 !scriptingOn, !collisionsOn, !physicsOn));
@@ -768,13 +767,13 @@ namespace OpenSim
768 } 767 }
769 else 768 else
770 { 769 {
771 m_console.Error("debug scene <scripting> <collisions> <physics> (where inside <> is true/false)"); 770 m_log.Error("debug scene <scripting> <collisions> <physics> (where inside <> is true/false)");
772 } 771 }
773 772
774 break; 773 break;
775 774
776 default: 775 default:
777 m_console.Error("Unknown debug"); 776 m_log.Error("Unknown debug");
778 break; 777 break;
779 } 778 }
780 } 779 }
@@ -805,9 +804,9 @@ namespace OpenSim
805 agents = m_sceneManager.GetCurrentSceneAvatars(); 804 agents = m_sceneManager.GetCurrentSceneAvatars();
806 } 805 }
807 806
808 m_console.Notice(String.Format("\nAgents connected: {0}\n", agents.Count)); 807 m_log.Info(String.Format("\nAgents connected: {0}\n", agents.Count));
809 808
810 m_console.Notice( 809 m_log.Info(
811 String.Format("{0,-16}{1,-16}{2,-37}{3,-11}{4,-16}", "Firstname", "Lastname", 810 String.Format("{0,-16}{1,-16}{2,-37}{3,-11}{4,-16}", "Firstname", "Lastname",
812 "Agent ID", "Root/Child", "Region")); 811 "Agent ID", "Root/Child", "Region"));
813 812
@@ -825,7 +824,7 @@ namespace OpenSim
825 regionName = regionInfo.RegionName; 824 regionName = regionInfo.RegionName;
826 } 825 }
827 826
828 m_console.Notice( 827 m_log.Info(
829 String.Format( 828 String.Format(
830 "{0,-16}{1,-16}{2,-37}{3,-11}{4,-16}", 829 "{0,-16}{1,-16}{2,-37}{3,-11}{4,-16}",
831 presence.Firstname, 830 presence.Firstname,
@@ -835,14 +834,14 @@ namespace OpenSim
835 regionName)); 834 regionName));
836 } 835 }
837 836
838 m_console.Notice(""); 837 m_log.Info("");
839 break; 838 break;
840 839
841 case "modules": 840 case "modules":
842 m_console.Notice("The currently loaded shared modules are:"); 841 m_log.Info("The currently loaded shared modules are:");
843 foreach (IRegionModule module in m_moduleLoader.GetLoadedSharedModules) 842 foreach (IRegionModule module in m_moduleLoader.GetLoadedSharedModules)
844 { 843 {
845 m_console.Notice("Shared Module: " + module.Name); 844 m_log.Info("Shared Module: " + module.Name);
846 } 845 }
847 break; 846 break;
848 847
@@ -850,7 +849,7 @@ namespace OpenSim
850 m_sceneManager.ForEachScene( 849 m_sceneManager.ForEachScene(
851 delegate(Scene scene) 850 delegate(Scene scene)
852 { 851 {
853 m_console.Notice("Region Name: " + scene.RegionInfo.RegionName + " , Region XLoc: " + 852 m_log.Info("Region Name: " + scene.RegionInfo.RegionName + " , Region XLoc: " +
854 scene.RegionInfo.RegionLocX + " , Region YLoc: " + 853 scene.RegionInfo.RegionLocX + " , Region YLoc: " +
855 scene.RegionInfo.RegionLocY + " , Region Port: " + 854 scene.RegionInfo.RegionLocY + " , Region Port: " +
856 scene.RegionInfo.InternalEndPoint.Port.ToString()); 855 scene.RegionInfo.InternalEndPoint.Port.ToString());
@@ -878,7 +877,7 @@ namespace OpenSim
878 { 877 {
879 rating = "PG"; 878 rating = "PG";
880 } 879 }
881 m_console.Notice("Region Name: " + scene.RegionInfo.RegionName + " , Region Rating: " + 880 m_log.Info("Region Name: " + scene.RegionInfo.RegionName + " , Region Rating: " +
882 rating); 881 rating);
883 }); 882 });
884 break; 883 break;
@@ -1044,7 +1043,7 @@ namespace OpenSim
1044 { 1043 {
1045 loadOffset.Z = (float) Convert.ToDecimal(cmdparams[6]); 1044 loadOffset.Z = (float) Convert.ToDecimal(cmdparams[6]);
1046 } 1045 }
1047 m_console.Error("loadOffsets <X,Y,Z> = <" + loadOffset.X + "," + loadOffset.Y + "," + 1046 m_log.Error("loadOffsets <X,Y,Z> = <" + loadOffset.X + "," + loadOffset.Y + "," +
1048 loadOffset.Z + ">"); 1047 loadOffset.Z + ">");
1049 } 1048 }
1050 } 1049 }
@@ -1058,7 +1057,7 @@ namespace OpenSim
1058 } 1057 }
1059 catch (FileNotFoundException) 1058 catch (FileNotFoundException)
1060 { 1059 {
1061 m_console.Error("Default xml not found. Usage: load-xml <filename>"); 1060 m_log.Error("Default xml not found. Usage: load-xml <filename>");
1062 } 1061 }
1063 } 1062 }
1064 } 1063 }
@@ -1085,7 +1084,7 @@ namespace OpenSim
1085 } 1084 }
1086 catch (FileNotFoundException) 1085 catch (FileNotFoundException)
1087 { 1086 {
1088 m_console.Error("Specified xml not found. Usage: load xml2 <filename>"); 1087 m_log.Error("Specified xml not found. Usage: load xml2 <filename>");
1089 } 1088 }
1090 } 1089 }
1091 else 1090 else
@@ -1096,7 +1095,7 @@ namespace OpenSim
1096 } 1095 }
1097 catch (FileNotFoundException) 1096 catch (FileNotFoundException)
1098 { 1097 {
1099 m_console.Error("Default xml not found. Usage: load xml2 <filename>"); 1098 m_log.Error("Default xml not found. Usage: load xml2 <filename>");
1100 } 1099 }
1101 } 1100 }
1102 } 1101 }
@@ -1120,7 +1119,7 @@ namespace OpenSim
1120 } 1119 }
1121 catch (Exception e) 1120 catch (Exception e)
1122 { 1121 {
1123 m_console.Error(e.Message); 1122 m_log.Error(e.Message);
1124 } 1123 }
1125 } 1124 }
1126 1125
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index eaf6e4f..3ea636a 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -273,7 +273,7 @@ namespace OpenSim
273 // 273 //
274 ICommander moduleCommander = SceneManager.CurrentOrFirstScene.GetCommander(cmd[1]); 274 ICommander moduleCommander = SceneManager.CurrentOrFirstScene.GetCommander(cmd[1]);
275 if (moduleCommander != null) 275 if (moduleCommander != null)
276 m_console.Notice(moduleCommander.Help); 276 m_console.Output(moduleCommander.Help);
277 } 277 }
278 278
279 protected override void Initialize() 279 protected override void Initialize()
diff --git a/OpenSim/Server/Base/HttpServerBase.cs b/OpenSim/Server/Base/HttpServerBase.cs
index dc12cf9..6b5c259 100644
--- a/OpenSim/Server/Base/HttpServerBase.cs
+++ b/OpenSim/Server/Base/HttpServerBase.cs
@@ -76,6 +76,10 @@ namespace OpenSim.Server.Base
76 } 76 }
77 77
78 m_HttpServer = new BaseHttpServer(port); 78 m_HttpServer = new BaseHttpServer(port);
79 if (MainConsole.Instance is RemoteConsole)
80 {
81 ((RemoteConsole)MainConsole.Instance).SetServer(m_HttpServer);
82 }
79 } 83 }
80 84
81 protected override void Initialise() 85 protected override void Initialise()
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 5350bce..0de6c4a 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -145,6 +145,11 @@ namespace OpenSim.Server.Base
145 { 145 {
146 MainConsole.Instance = new CommandConsole(prompt); 146 MainConsole.Instance = new CommandConsole(prompt);
147 } 147 }
148 else if (consoleType == "rest")
149 {
150 MainConsole.Instance = new RemoteConsole(prompt);
151 ((RemoteConsole)MainConsole.Instance).ReadConfig(Config);
152 }
148 else 153 else
149 { 154 {
150 MainConsole.Instance = new LocalConsole(prompt); 155 MainConsole.Instance = new LocalConsole(prompt);
diff --git a/OpenSim/TestSuite/PhysicsBot.cs b/OpenSim/TestSuite/PhysicsBot.cs
index fd20a1e..68c1c8a 100644
--- a/OpenSim/TestSuite/PhysicsBot.cs
+++ b/OpenSim/TestSuite/PhysicsBot.cs
@@ -147,7 +147,7 @@ namespace OpenSim.TestSuite
147 } 147 }
148 else 148 else
149 { 149 {
150 MainConsole.Instance.Error(firstname + " " + lastname, "Can't login: " + client.Network.LoginMessage); 150 MainConsole.Instance.Output(firstname + " " + lastname + "Can't login: " + client.Network.LoginMessage);
151 if (OnDisconnected != null) 151 if (OnDisconnected != null)
152 { 152 {
153 OnDisconnected(this, EventType.DISCONNECTED); 153 OnDisconnected(this, EventType.DISCONNECTED);
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 2cd947e..93240d5 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -213,7 +213,7 @@ namespace pCampBot
213 213
214 private void HandleShutdown(string module, string[] cmd) 214 private void HandleShutdown(string module, string[] cmd)
215 { 215 {
216 m_console.Warn("BOTMANAGER", "Shutting down bots"); 216 m_log.Warn("[BOTMANAGER]: Shutting down bots");
217 doBotShutdown(); 217 doBotShutdown();
218 } 218 }
219 219
diff --git a/OpenSim/Tools/pCampBot/PhysicsBot.cs b/OpenSim/Tools/pCampBot/PhysicsBot.cs
index b84993e..282f4a0 100644
--- a/OpenSim/Tools/pCampBot/PhysicsBot.cs
+++ b/OpenSim/Tools/pCampBot/PhysicsBot.cs
@@ -180,7 +180,7 @@ namespace pCampBot
180 } 180 }
181 else 181 else
182 { 182 {
183 MainConsole.Instance.Error(firstname + " " + lastname, "Can't login: " + client.Network.LoginMessage); 183 MainConsole.Instance.Output(firstname + " " + lastname + " Can't login: " + client.Network.LoginMessage);
184 if (OnDisconnected != null) 184 if (OnDisconnected != null)
185 { 185 {
186 OnDisconnected(this, EventType.DISCONNECTED); 186 OnDisconnected(this, EventType.DISCONNECTED);
@@ -222,12 +222,12 @@ namespace pCampBot
222 } 222 }
223 else 223 else
224 { 224 {
225 MainConsole.Instance.Error(String.Format("Failed to decode {0} asset {1}", asset.AssetType, asset.AssetID)); 225 MainConsole.Instance.Output(String.Format("Failed to decode {0} asset {1}", asset.AssetType, asset.AssetID));
226 } 226 }
227 } 227 }
228 catch (Exception e) 228 catch (Exception e)
229 { 229 {
230 MainConsole.Instance.Error(String.Format("Exception: {0}",e.ToString())); 230 MainConsole.Instance.Output(String.Format("Exception: {0}",e.ToString()));
231 } 231 }
232 } 232 }
233 } 233 }
@@ -261,7 +261,7 @@ namespace pCampBot
261 if (wear == "yes") 261 if (wear == "yes")
262 { 262 {
263 //TODO: Implement random outfit picking 263 //TODO: Implement random outfit picking
264 MainConsole.Instance.Notice("Picks a random outfit. Not yet implemented."); 264 MainConsole.Instance.Output("Picks a random outfit. Not yet implemented.");
265 } 265 }
266 else if (wear != "save") 266 else if (wear != "save")
267 saveDir = "MyAppearance/" + wear; 267 saveDir = "MyAppearance/" + wear;
@@ -290,7 +290,7 @@ namespace pCampBot
290 listwearables.Add(item); 290 listwearables.Add(item);
291 } 291 }
292 else 292 else
293 MainConsole.Instance.Error(String.Format("Failed to create item {0}",item.Name)); 293 MainConsole.Instance.Output(String.Format("Failed to create item {0}",item.Name));
294 } 294 }
295 ); 295 );
296 } 296 }
@@ -312,7 +312,7 @@ namespace pCampBot
312 listwearables.Add(item); 312 listwearables.Add(item);
313 } 313 }
314 else 314 else
315 MainConsole.Instance.Error(String.Format("Failed to create item {0}",item.Name)); 315 MainConsole.Instance.Output(String.Format("Failed to create item {0}",item.Name));
316 } 316 }
317 ); 317 );
318 } 318 }
@@ -320,10 +320,10 @@ namespace pCampBot
320 Thread.Sleep(1000); 320 Thread.Sleep(1000);
321 321
322 if (listwearables == null || listwearables.Count == 0) 322 if (listwearables == null || listwearables.Count == 0)
323 MainConsole.Instance.Notice("Nothing to send on this folder!"); 323 MainConsole.Instance.Output("Nothing to send on this folder!");
324 else 324 else
325 { 325 {
326 MainConsole.Instance.Notice(String.Format("Sending {0} wearables...",listwearables.Count)); 326 MainConsole.Instance.Output(String.Format("Sending {0} wearables...",listwearables.Count));
327 client.Appearance.WearOutfit(listwearables, false); 327 client.Appearance.WearOutfit(listwearables, false);
328 } 328 }
329 } 329 }
generated by cgit v1.1 at 2024-12-23 17:01:32 +0000