aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorCharles Krinke2009-02-22 20:52:55 +0000
committerCharles Krinke2009-02-22 20:52:55 +0000
commit8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49 (patch)
tree96a24a49de82056060dd9b7bab0cb209d5f1a129 /OpenSim/Region/Application
parentAllow delivery of object messages gridwide (diff)
downloadopensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.zip
opensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.gz
opensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.bz2
opensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.xz
Mantis#3218. Thank you kindly, TLaukkan (Tommil) for a patch that:
* Added log4net dependency to physxplugin in prebuild.xml. * Added missing m_log fields to classes. * Replaced Console.WriteLine with appropriate m_log.Xxxx * Tested that nant test target runs succesfully. * Tested that local opensim sandbox starts up without errors.
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/Application.cs8
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs2
-rw-r--r--OpenSim/Region/Application/HGOpenSimNode.cs10
3 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index b8fa786..017160a 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -55,15 +55,15 @@ namespace OpenSim
55 55
56 XmlConfigurator.Configure(); 56 XmlConfigurator.Configure();
57 57
58 Console.Write("Performing compatibility checks... "); 58 m_log.Info("Performing compatibility checks... ");
59 string supported = String.Empty; 59 string supported = String.Empty;
60 if (Util.IsEnvironmentSupported(ref supported)) 60 if (Util.IsEnvironmentSupported(ref supported))
61 { 61 {
62 Console.WriteLine(" Environment is compatible.\n"); 62 m_log.Info("Environment is compatible.\n");
63 } 63 }
64 else 64 else
65 { 65 {
66 Console.WriteLine(" Environment is unsupported (" + supported + ")\n"); 66 m_log.Warn("Environment is unsupported (" + supported + ")\n");
67 } 67 }
68 68
69 Culture.SetCurrentCulture(); 69 Culture.SetCurrentCulture();
@@ -115,7 +115,7 @@ namespace OpenSim
115 } 115 }
116 catch (Exception e) 116 catch (Exception e)
117 { 117 {
118 Console.WriteLine("Caught exception from command: {0}", e); 118 m_log.Error("Caught exception from command: {0}", e);
119 } 119 }
120 } 120 }
121 } 121 }
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index f0c57e0..f3f9f29 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -265,7 +265,7 @@ namespace OpenSim
265 if (m_configSettings.StorageDll == "OpenSim.DataStore.MonoSqlite.dll") 265 if (m_configSettings.StorageDll == "OpenSim.DataStore.MonoSqlite.dll")
266 { 266 {
267 m_configSettings.StorageDll = "OpenSim.Data.SQLite.dll"; 267 m_configSettings.StorageDll = "OpenSim.Data.SQLite.dll";
268 Console.WriteLine("WARNING: OpenSim.DataStore.MonoSqlite.dll is deprecated. Set storage_plugin to OpenSim.Data.SQLite.dll."); 268 m_log.Warn("WARNING: OpenSim.DataStore.MonoSqlite.dll is deprecated. Set storage_plugin to OpenSim.Data.SQLite.dll.");
269 Thread.Sleep(3000); 269 Thread.Sleep(3000);
270 } 270 }
271 271
diff --git a/OpenSim/Region/Application/HGOpenSimNode.cs b/OpenSim/Region/Application/HGOpenSimNode.cs
index 6ec00fe..ded6443 100644
--- a/OpenSim/Region/Application/HGOpenSimNode.cs
+++ b/OpenSim/Region/Application/HGOpenSimNode.cs
@@ -192,7 +192,7 @@ namespace OpenSim
192 for (int i = 3; i < cmdparams.Count; i++) 192 for (int i = 3; i < cmdparams.Count; i++)
193 mapName += " " + cmdparams[i]; 193 mapName += " " + cmdparams[i];
194 194
195 Console.WriteLine(">> MapName: " + mapName); 195 m_log.Info(">> MapName: " + mapName);
196 //internalPort = Convert.ToUInt32(cmdparams[4]); 196 //internalPort = Convert.ToUInt32(cmdparams[4]);
197 //remotingPort = Convert.ToUInt32(cmdparams[5]); 197 //remotingPort = Convert.ToUInt32(cmdparams[5]);
198 } 198 }
@@ -285,7 +285,7 @@ namespace OpenSim
285 } 285 }
286 catch (Exception e) 286 catch (Exception e)
287 { 287 {
288 Console.WriteLine(e.ToString()); 288 m_log.Error(e.ToString());
289 } 289 }
290 } 290 }
291 291
@@ -323,9 +323,9 @@ namespace OpenSim
323 323
324 private void LinkRegionCmdUsage() 324 private void LinkRegionCmdUsage()
325 { 325 {
326 Console.WriteLine("Usage: link-region <Xloc> <Yloc> <HostName>:<HttpPort>[:<RemoteRegionName>]"); 326 m_log.Info("Usage: link-region <Xloc> <Yloc> <HostName>:<HttpPort>[:<RemoteRegionName>]");
327 Console.WriteLine("Usage: link-region <Xloc> <Yloc> <HostName> <HttpPort> [<LocalName>]"); 327 m_log.Info("Usage: link-region <Xloc> <Yloc> <HostName> <HttpPort> [<LocalName>]");
328 Console.WriteLine("Usage: link-region <URI_of_xml> [<exclude>]"); 328 m_log.Info("Usage: link-region <URI_of_xml> [<exclude>]");
329 } 329 }
330 } 330 }
331} 331}