ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

revert r2162 as it completely clobbered all the work on

Browse Source 
the ChatModule by MW and myself.  Couldn't find Adam online
after that rev went in.
This commit is contained in:
Sean Dague
2007-10-22 15:37:54 +00:00
parent c4707a284f
commit 6acaabefc3
18 changed files with 500 additions and 573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/Communications/Cache/AssetCache.cs
View File

@@ -72,7 +72,7 @@ namespace OpenSim.Framework.Communications.Cache
/// </summary>
public AssetCache(IAssetServer assetServer)
{
OpenSim.Framework.Console.MainLog.Instance.Verbose("ASSETSTORAGE","Creating Asset cache");
System.Console.WriteLine("Creating Asset cache");
_assetServer = assetServer;
_assetServer.SetReceiver(this);
Assets = new Dictionary<LLUUID, AssetInfo>();
@@ -89,7 +89,7 @@ namespace OpenSim.Framework.Communications.Cache
public AssetCache(string assetServerDLLName, string assetServerURL, string assetServerKey)
{
OpenSim.Framework.Console.MainLog.Instance.Verbose("ASSETSTORAGE", "Creating Asset cache");
System.Console.WriteLine("Creating Asset cache");
_assetServer = this.LoadAssetDll(assetServerDLLName);

4
OpenSim/Framework/Communications/Cache/AssetServer.cs
View File

@@ -51,7 +51,7 @@ namespace OpenSim.Framework.Communications.Cache
yapfile = File.Exists(Path.Combine(Util.dataDir(), "regionassets.yap"));
db = Db4oFactory.OpenFile(Path.Combine(Util.dataDir(), "regionassets.yap"));
MainLog.Instance.Verbose("ASSETS","Db4 Asset database creation");
MainLog.Instance.Verbose("Db4 Asset database creation");
if (!yapfile)
{
@@ -75,7 +75,7 @@ namespace OpenSim.Framework.Communications.Cache
if (db != null)
{
MainLog.Instance.Verbose("ASSETSERVER","Closing local asset server database");
MainLog.Instance.Verbose("Closing local asset server database");
db.Close();
}
}

4
OpenSim/Framework/Communications/Cache/AssetServerBase.cs
View File

@@ -36,8 +36,8 @@ namespace OpenSim.Framework.Communications.Cache
public AssetServerBase()
{
OpenSim.Framework.Console.MainLog.Instance.Verbose("ASSETSERVER","Starting Db4o asset storage system");
{
System.Console.WriteLine("Starting Db4o asset storage system");
this._assetRequests = new BlockingQueue<ARequest>();
this._localAssetServerThread = new Thread( RunRequests );

4
OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
View File

@@ -68,7 +68,7 @@ namespace OpenSim.Framework.Communications.Cache
m_assetProviderPlugin = plug;
m_assetProviderPlugin.Initialise();
MainLog.Instance.Verbose("AssetStorage","Added " + m_assetProviderPlugin.Name + " " + m_assetProviderPlugin.Version);
MainLog.Instance.Verbose("AssetStorage: Added " + m_assetProviderPlugin.Name + " " + m_assetProviderPlugin.Version);
}
typeInterface = null;
@@ -92,7 +92,7 @@ namespace OpenSim.Framework.Communications.Cache
{
ARequest req = this._assetRequests.Dequeue();
MainLog.Instance.Verbose("AssetStorage","Requesting asset: " + req.AssetID);
MainLog.Instance.Verbose("Requesting asset: " + req.AssetID);
AssetBase asset = null;
lock (syncLock)

2
OpenSim/Framework/Communications/InventoryServiceBase.cs
View File

@@ -70,7 +70,7 @@ namespace OpenSim.Framework.Communications
(IInventoryData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
plug.Initialise();
this.m_plugins.Add(plug.getName(), plug);
MainLog.Instance.Verbose("INVENTORY","Added IInventoryData Interface");
MainLog.Instance.Verbose("Inventorystorage: Added IInventoryData Interface");
}
}
}

2
OpenSim/Framework/Communications/LoginService.cs
View File

@@ -66,7 +66,7 @@ namespace OpenSim.Framework.UserManagement
public XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)
{
MainLog.Instance.Verbose("LOGIN","Attempting login now...");
MainLog.Instance.Verbose("Attempting login now...");
XmlRpcResponse response = new XmlRpcResponse();
Hashtable requestData = (Hashtable)request.Params[0];

63
OpenSim/Framework/Console/LogBase.cs
View File

@@ -170,11 +170,8 @@ namespace OpenSim.Framework.Console
/// <param name="args">WriteLine-style message arguments</param>
public void Verbose(string format, params object[] args)
{
if (!m_silent)
{
WriteNewLine(ConsoleColor.Gray, format, args);
return;
}
WriteNewLine(ConsoleColor.Gray, format, args);
return;
}
/// <summary>
@@ -185,12 +182,9 @@ namespace OpenSim.Framework.Console
/// <param name="args">WriteLine-style message arguments</param>
public void Verbose(string sender, string format, params object[] args)
{
if (!m_silent)
{
WritePrefixLine(DeriveColor(sender), sender);
WriteNewLine(ConsoleColor.Gray, format, args);
return;
}
WritePrefixLine(DeriveColor(sender), sender);
WriteNewLine(ConsoleColor.Gray, format, args);
return;
}
/// <summary>
@@ -240,20 +234,22 @@ namespace OpenSim.Framework.Console
Log.Write(now);
Log.WriteLine(format, args);
Log.Flush();
System.Console.Write(now);
try
if (!m_silent)
{
if (color != ConsoleColor.White)
System.Console.ForegroundColor = color;
System.Console.Write(now);
try
{
if (color != ConsoleColor.White)
System.Console.ForegroundColor = color;
System.Console.WriteLine(format, args);
System.Console.ResetColor();
}
catch (ArgumentNullException)
{
// Some older systems dont support coloured text.
System.Console.WriteLine(format, args);
System.Console.WriteLine(format, args);
System.Console.ResetColor();
}
catch (ArgumentNullException)
{
// Some older systems dont support coloured text.
System.Console.WriteLine(format, args);
}
}
return;
}
@@ -269,16 +265,19 @@ namespace OpenSim.Framework.Console
System.Console.Write("[");
try
if (!m_silent)
{
System.Console.ForegroundColor = color;
System.Console.Write(sender);
System.Console.ResetColor();
}
catch (ArgumentNullException)
{
// Some older systems dont support coloured text.
System.Console.WriteLine(sender);
try
{
System.Console.ForegroundColor = color;
System.Console.Write(sender);
System.Console.ResetColor();
}
catch (ArgumentNullException)
{
// Some older systems dont support coloured text.
System.Console.WriteLine(sender);
}
}
System.Console.Write("] \t");

8
OpenSim/Framework/General/Types/EstateSettings.cs
View File

@@ -557,12 +557,8 @@ namespace OpenSim.Framework.Types
private ConfigurationMember configMember;
public EstateSettings()
{
// Temporary hack to prevent multiple loadings.
if (configMember == null)
{
configMember = new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.xml"), "ESTATE SETTINGS", this.loadConfigurationOptions, this.handleIncomingConfiguration);
configMember.performConfigurationRetrieve();
}
configMember = new ConfigurationMember(Path.Combine(Util.configDir(),"estate_settings.xml"), "ESTATE SETTINGS", this.loadConfigurationOptions, this.handleIncomingConfiguration);
configMember.performConfigurationRetrieve();
}
public void loadConfigurationOptions()

2
OpenSim/Framework/Servers/BaseHttpServer.cs
View File

@@ -224,7 +224,7 @@ namespace OpenSim.Framework.Servers
{
try
{
MainLog.Instance.Verbose("HTTPD", "Spawned main thread OK");
MainLog.Instance.Status("HTTPD", "Spawned main thread OK");
m_httpListener = new HttpListener();
m_httpListener.Prefixes.Add("http://+:" + m_port + "/");