aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorAdam Frisby2007-07-29 09:37:29 +0000
committerAdam Frisby2007-07-29 09:37:29 +0000
commit038774de30ce26120c91ccd8e1cda1b2a89e1841 (patch)
treef7f6e0c7027737b7ad77cbb4de09b734c436e903 /OpenSim/Framework
parent* Fixed an issue with Mono/UNIX filenames and DB4o storage engine. (diff)
downloadopensim-SC-038774de30ce26120c91ccd8e1cda1b2a89e1841.zip
opensim-SC-038774de30ce26120c91ccd8e1cda1b2a89e1841.tar.gz
opensim-SC-038774de30ce26120c91ccd8e1cda1b2a89e1841.tar.bz2
opensim-SC-038774de30ce26120c91ccd8e1cda1b2a89e1841.tar.xz
Commit 1/2
* DB4o no longer crashes the sim on Startup * DB4o now crashes the sim on shutdown. * Variety of console verbosity fixes.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Cache/UserProfileCache.cs2
-rw-r--r--OpenSim/Framework/Console/LogBase.cs4
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs4
3 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCache.cs b/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
index 32c5db9..2f3691c 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Framework.Communications.Caches
70 } 70 }
71 else 71 else
72 { 72 {
73 Console.WriteLine("UserProfileCache.cs: user profile for user not found"); 73 Console.WriteLine("CACHE", "User profile for user not found");
74 } 74 }
75 } 75 }
76 } 76 }
diff --git a/OpenSim/Framework/Console/LogBase.cs b/OpenSim/Framework/Console/LogBase.cs
index 8b8d8df..0aa42d1 100644
--- a/OpenSim/Framework/Console/LogBase.cs
+++ b/OpenSim/Framework/Console/LogBase.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Framework.Console
55 this.componentname = componentname; 55 this.componentname = componentname;
56 this.cmdparser = cmdparser; 56 this.cmdparser = cmdparser;
57 this.m_silent = silent; 57 this.m_silent = silent;
58 System.Console.WriteLine("ServerConsole.cs - creating new local console"); 58 System.Console.WriteLine("Creating new local console");
59 59
60 if (String.IsNullOrEmpty(LogFile)) 60 if (String.IsNullOrEmpty(LogFile))
61 { 61 {
@@ -280,7 +280,7 @@ namespace OpenSim.Framework.Console
280 } 280 }
281 } 281 }
282 282
283 System.Console.Write("] "); 283 System.Console.Write("] \t");
284 284
285 return; 285 return;
286 } 286 }
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index d0784f3..c514b96 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -185,7 +185,7 @@ namespace OpenSim.Framework.Servers
185 185
186 public void Start() 186 public void Start()
187 { 187 {
188 MainLog.Instance.Verbose("HTTPD", "BaseHttpServer.cs: Starting up HTTP Server"); 188 MainLog.Instance.Verbose("HTTPD", "Starting up HTTP Server");
189 189
190 m_workerThread = new Thread(new ThreadStart(StartHTTP)); 190 m_workerThread = new Thread(new ThreadStart(StartHTTP));
191 m_workerThread.IsBackground = true; 191 m_workerThread.IsBackground = true;
@@ -196,7 +196,7 @@ namespace OpenSim.Framework.Servers
196 { 196 {
197 try 197 try
198 { 198 {
199 MainLog.Instance.Status("HTTPD", "BaseHttpServer.cs: StartHTTP() - Spawned main thread OK"); 199 MainLog.Instance.Status("HTTPD", "Spawned main thread OK");
200 m_httpListener = new HttpListener(); 200 m_httpListener = new HttpListener();
201 201
202 m_httpListener.Prefixes.Add("http://+:" + m_port + "/"); 202 m_httpListener.Prefixes.Add("http://+:" + m_port + "/");