aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorAdam Frisby2007-10-22 21:57:32 +0000
committerAdam Frisby2007-10-22 21:57:32 +0000
commit5dad0ed7296b4abfe2c934a8404022a4d2189051 (patch)
treea1151b7ba2e093e947034b40ad10b8614137cf05 /OpenSim/Framework
parent* Made EstateSetting static since there's only one instance, and we only need... (diff)
downloadopensim-SC_OLD-5dad0ed7296b4abfe2c934a8404022a4d2189051.zip
opensim-SC_OLD-5dad0ed7296b4abfe2c934a8404022a4d2189051.tar.gz
opensim-SC_OLD-5dad0ed7296b4abfe2c934a8404022a4d2189051.tar.bz2
opensim-SC_OLD-5dad0ed7296b4abfe2c934a8404022a4d2189051.tar.xz
* Return of R2162. /Take that SVN!/
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs4
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetServer.cs4
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetServerBase.cs2
-rw-r--r--OpenSim/Framework/Communications/Cache/SQLAssetServer.cs4
-rw-r--r--OpenSim/Framework/Communications/InventoryServiceBase.cs2
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs2
-rw-r--r--OpenSim/Framework/Console/LogBase.cs63
-rw-r--r--OpenSim/Framework/General/Types/EstateSettings.cs8
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs2
9 files changed, 48 insertions, 43 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 17829b2..9dbd50e 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Framework.Communications.Cache
72 /// </summary> 72 /// </summary>
73 public AssetCache(IAssetServer assetServer) 73 public AssetCache(IAssetServer assetServer)
74 { 74 {
75 System.Console.WriteLine("Creating Asset cache"); 75 OpenSim.Framework.Console.MainLog.Instance.Verbose("ASSETSTORAGE","Creating Asset cache");
76 _assetServer = assetServer; 76 _assetServer = assetServer;
77 _assetServer.SetReceiver(this); 77 _assetServer.SetReceiver(this);
78 Assets = new Dictionary<LLUUID, AssetInfo>(); 78 Assets = new Dictionary<LLUUID, AssetInfo>();
@@ -89,7 +89,7 @@ namespace OpenSim.Framework.Communications.Cache
89 89
90 public AssetCache(string assetServerDLLName, string assetServerURL, string assetServerKey) 90 public AssetCache(string assetServerDLLName, string assetServerURL, string assetServerKey)
91 { 91 {
92 System.Console.WriteLine("Creating Asset cache"); 92 OpenSim.Framework.Console.MainLog.Instance.Verbose("ASSETSTORAGE", "Creating Asset cache");
93 _assetServer = this.LoadAssetDll(assetServerDLLName); 93 _assetServer = this.LoadAssetDll(assetServerDLLName);
94 94
95 95
diff --git a/OpenSim/Framework/Communications/Cache/AssetServer.cs b/OpenSim/Framework/Communications/Cache/AssetServer.cs
index 22bdc5c..aebda00 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServer.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Framework.Communications.Cache
51 yapfile = File.Exists(Path.Combine(Util.dataDir(), "regionassets.yap")); 51 yapfile = File.Exists(Path.Combine(Util.dataDir(), "regionassets.yap"));
52 52
53 db = Db4oFactory.OpenFile(Path.Combine(Util.dataDir(), "regionassets.yap")); 53 db = Db4oFactory.OpenFile(Path.Combine(Util.dataDir(), "regionassets.yap"));
54 MainLog.Instance.Verbose("Db4 Asset database creation"); 54 MainLog.Instance.Verbose("ASSETS","Db4 Asset database creation");
55 55
56 if (!yapfile) 56 if (!yapfile)
57 { 57 {
@@ -75,7 +75,7 @@ namespace OpenSim.Framework.Communications.Cache
75 75
76 if (db != null) 76 if (db != null)
77 { 77 {
78 MainLog.Instance.Verbose("Closing local asset server database"); 78 MainLog.Instance.Verbose("ASSETSERVER","Closing local asset server database");
79 db.Close(); 79 db.Close();
80 } 80 }
81 } 81 }
diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
index 08d5b87..a3ec346 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Framework.Communications.Cache
37 37
38 public AssetServerBase() 38 public AssetServerBase()
39 { 39 {
40 System.Console.WriteLine("Starting Db4o asset storage system"); 40 OpenSim.Framework.Console.MainLog.Instance.Verbose("ASSETSERVER","Starting Db4o asset storage system");
41 this._assetRequests = new BlockingQueue<ARequest>(); 41 this._assetRequests = new BlockingQueue<ARequest>();
42 42
43 this._localAssetServerThread = new Thread( RunRequests ); 43 this._localAssetServerThread = new Thread( RunRequests );
diff --git a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
index 69f83d2..580e5c4 100644
--- a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Framework.Communications.Cache
68 m_assetProviderPlugin = plug; 68 m_assetProviderPlugin = plug;
69 m_assetProviderPlugin.Initialise(); 69 m_assetProviderPlugin.Initialise();
70 70
71 MainLog.Instance.Verbose("AssetStorage: Added " + m_assetProviderPlugin.Name + " " + m_assetProviderPlugin.Version); 71 MainLog.Instance.Verbose("AssetStorage","Added " + m_assetProviderPlugin.Name + " " + m_assetProviderPlugin.Version);
72 } 72 }
73 73
74 typeInterface = null; 74 typeInterface = null;
@@ -92,7 +92,7 @@ namespace OpenSim.Framework.Communications.Cache
92 { 92 {
93 ARequest req = this._assetRequests.Dequeue(); 93 ARequest req = this._assetRequests.Dequeue();
94 94
95 MainLog.Instance.Verbose("Requesting asset: " + req.AssetID); 95 MainLog.Instance.Verbose("AssetStorage","Requesting asset: " + req.AssetID);
96 96
97 AssetBase asset = null; 97 AssetBase asset = null;
98 lock (syncLock) 98 lock (syncLock)
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index 65eb509..06a1ca8 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Framework.Communications
70 (IInventoryData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 70 (IInventoryData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
71 plug.Initialise(); 71 plug.Initialise();
72 this.m_plugins.Add(plug.getName(), plug); 72 this.m_plugins.Add(plug.getName(), plug);
73 MainLog.Instance.Verbose("Inventorystorage: Added IInventoryData Interface"); 73 MainLog.Instance.Verbose("INVENTORY","Added IInventoryData Interface");
74 } 74 }
75 } 75 }
76 } 76 }
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 674c746..f4648df 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Framework.UserManagement
66 public XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request) 66 public XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)
67 { 67 {
68 68
69 MainLog.Instance.Verbose("Attempting login now..."); 69 MainLog.Instance.Verbose("LOGIN","Attempting login now...");
70 XmlRpcResponse response = new XmlRpcResponse(); 70 XmlRpcResponse response = new XmlRpcResponse();
71 Hashtable requestData = (Hashtable)request.Params[0]; 71 Hashtable requestData = (Hashtable)request.Params[0];
72 72
diff --git a/OpenSim/Framework/Console/LogBase.cs b/OpenSim/Framework/Console/LogBase.cs
index 5a7ce4d..246afa1 100644
--- a/OpenSim/Framework/Console/LogBase.cs
+++ b/OpenSim/Framework/Console/LogBase.cs
@@ -170,8 +170,11 @@ namespace OpenSim.Framework.Console
170 /// <param name="args">WriteLine-style message arguments</param> 170 /// <param name="args">WriteLine-style message arguments</param>
171 public void Verbose(string format, params object[] args) 171 public void Verbose(string format, params object[] args)
172 { 172 {
173 WriteNewLine(ConsoleColor.Gray, format, args); 173 if (!m_silent)
174 return; 174 {
175 WriteNewLine(ConsoleColor.Gray, format, args);
176 return;
177 }
175 } 178 }
176 179
177 /// <summary> 180 /// <summary>
@@ -182,9 +185,12 @@ namespace OpenSim.Framework.Console
182 /// <param name="args">WriteLine-style message arguments</param> 185 /// <param name="args">WriteLine-style message arguments</param>
183 public void Verbose(string sender, string format, params object[] args) 186 public void Verbose(string sender, string format, params object[] args)
184 { 187 {
185 WritePrefixLine(DeriveColor(sender), sender); 188 if (!m_silent)
186 WriteNewLine(ConsoleColor.Gray, format, args); 189 {
187 return; 190 WritePrefixLine(DeriveColor(sender), sender);
191 WriteNewLine(ConsoleColor.Gray, format, args);
192 return;
193 }
188 } 194 }
189 195
190 /// <summary> 196 /// <summary>
@@ -234,22 +240,20 @@ namespace OpenSim.Framework.Console
234 Log.Write(now); 240 Log.Write(now);
235 Log.WriteLine(format, args); 241 Log.WriteLine(format, args);
236 Log.Flush(); 242 Log.Flush();
237 if (!m_silent) 243
244 System.Console.Write(now);
245 try
238 { 246 {
239 System.Console.Write(now); 247 if (color != ConsoleColor.White)
240 try 248 System.Console.ForegroundColor = color;
241 {
242 if (color != ConsoleColor.White)
243 System.Console.ForegroundColor = color;
244 249
245 System.Console.WriteLine(format, args); 250 System.Console.WriteLine(format, args);
246 System.Console.ResetColor(); 251 System.Console.ResetColor();
247 } 252 }
248 catch (ArgumentNullException) 253 catch (ArgumentNullException)
249 { 254 {
250 // Some older systems dont support coloured text. 255 // Some older systems dont support coloured text.
251 System.Console.WriteLine(format, args); 256 System.Console.WriteLine(format, args);
252 }
253 } 257 }
254 return; 258 return;
255 } 259 }
@@ -265,19 +269,16 @@ namespace OpenSim.Framework.Console
265 269
266 System.Console.Write("["); 270 System.Console.Write("[");
267 271
268 if (!m_silent) 272 try
269 { 273 {
270 try 274 System.Console.ForegroundColor = color;
271 { 275 System.Console.Write(sender);
272 System.Console.ForegroundColor = color; 276 System.Console.ResetColor();
273 System.Console.Write(sender); 277 }
274 System.Console.ResetColor(); 278 catch (ArgumentNullException)
275 } 279 {
276 catch (ArgumentNullException) 280 // Some older systems dont support coloured text.
277 { 281 System.Console.WriteLine(sender);
278 // Some older systems dont support coloured text.
279 System.Console.WriteLine(sender);
280 }
281 } 282 }
282 283
283 System.Console.Write("] \t"); 284 System.Console.Write("] \t");
diff --git a/OpenSim/Framework/General/Types/EstateSettings.cs b/OpenSim/Framework/General/Types/EstateSettings.cs
index abdcf6f..2675e52 100644
--- a/OpenSim/Framework/General/Types/EstateSettings.cs
+++ b/OpenSim/Framework/General/Types/EstateSettings.cs
@@ -557,8 +557,12 @@ namespace OpenSim.Framework.Types
557 private ConfigurationMember configMember; 557 private ConfigurationMember configMember;
558 public EstateSettings() 558 public EstateSettings()
559 { 559 {
560 configMember = new ConfigurationMember(Path.Combine(Util.configDir(),"estate_settings.xml"), "ESTATE SETTINGS", this.loadConfigurationOptions, this.handleIncomingConfiguration); 560 // Temporary hack to prevent multiple loadings.
561 configMember.performConfigurationRetrieve(); 561 if (configMember == null)
562 {
563 configMember = new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.xml"), "ESTATE SETTINGS", this.loadConfigurationOptions, this.handleIncomingConfiguration);
564 configMember.performConfigurationRetrieve();
565 }
562 } 566 }
563 567
564 public void loadConfigurationOptions() 568 public void loadConfigurationOptions()
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 6d432fd..179a651 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -224,7 +224,7 @@ namespace OpenSim.Framework.Servers
224 { 224 {
225 try 225 try
226 { 226 {
227 MainLog.Instance.Status("HTTPD", "Spawned main thread OK"); 227 MainLog.Instance.Verbose("HTTPD", "Spawned main thread OK");
228 m_httpListener = new HttpListener(); 228 m_httpListener = new HttpListener();
229 229
230 m_httpListener.Prefixes.Add("http://+:" + m_port + "/"); 230 m_httpListener.Prefixes.Add("http://+:" + m_port + "/");