fixed filenames in log messages
parent
064404ab40
commit
13854d562f
|
@ -113,7 +113,7 @@ namespace OpenSim.Framework.Servers
|
|||
}
|
||||
catch (Exception)
|
||||
{
|
||||
OpenSim.Framework.Console.MainLog.Instance.Warn("OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection ");
|
||||
OpenSim.Framework.Console.MainLog.Instance.Warn("CheckSumServer.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection ");
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -63,7 +63,7 @@ namespace OpenGrid.Config.GridConfigDb4o
|
|||
/// User configuration for the Grid Config interfaces
|
||||
/// </summary>
|
||||
public void LoadDefaults() {
|
||||
MainLog.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
|
||||
MainLog.Instance.Notice("DbGridConfig.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
|
||||
|
||||
// About the grid options
|
||||
this.GridOwner = MainLog.Instance.CmdPrompt("Grid owner", "OGS development team");
|
||||
|
@ -95,7 +95,7 @@ namespace OpenGrid.Config.GridConfigDb4o
|
|||
IObjectSet result = db.Get(typeof(DbGridConfig));
|
||||
// Found?
|
||||
if(result.Count==1) {
|
||||
MainLog.Instance.Verbose("Config.cs:InitConfig() - Found a GridConfig object in the local database, loading");
|
||||
MainLog.Instance.Verbose("DbGridConfig.cs:InitConfig() - Found a GridConfig object in the local database, loading");
|
||||
foreach (DbGridConfig cfg in result) {
|
||||
// Import each setting into this class
|
||||
// Grid Settings
|
||||
|
@ -114,7 +114,7 @@ namespace OpenGrid.Config.GridConfigDb4o
|
|||
}
|
||||
// Create a new configuration object from this class
|
||||
} else {
|
||||
MainLog.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
|
||||
MainLog.Instance.Verbose("DbGridConfig.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
|
||||
|
||||
// Load default settings into this class
|
||||
LoadDefaults();
|
||||
|
@ -127,7 +127,7 @@ namespace OpenGrid.Config.GridConfigDb4o
|
|||
db.Close();
|
||||
}
|
||||
} catch(Exception e) {
|
||||
MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
|
||||
MainLog.Instance.Warn("DbGridConfig.cs:InitConfig() - Exception occured");
|
||||
MainLog.Instance.Warn(e.ToString());
|
||||
}
|
||||
|
||||
|
|
|
@ -47,7 +47,7 @@ namespace OpenUser.Config.UserConfigDb4o
|
|||
private IObjectContainer db;
|
||||
|
||||
public void LoadDefaults() {
|
||||
MainLog.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
|
||||
MainLog.Instance.Notice("DbUserConfig.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
|
||||
|
||||
this.DefaultStartupMsg = MainLog.Instance.CmdPrompt("Default startup message", "Welcome to OGS");
|
||||
|
||||
|
@ -61,7 +61,7 @@ namespace OpenUser.Config.UserConfigDb4o
|
|||
db = Db4oFactory.OpenFile("openuser.yap");
|
||||
IObjectSet result = db.Get(typeof(DbUserConfig));
|
||||
if(result.Count==1) {
|
||||
MainLog.Instance.Verbose("Config.cs:InitConfig() - Found a UserConfig object in the local database, loading");
|
||||
MainLog.Instance.Verbose("DbUserConfig.cs:InitConfig() - Found a UserConfig object in the local database, loading");
|
||||
foreach (DbUserConfig cfg in result) {
|
||||
this.GridServerURL=cfg.GridServerURL;
|
||||
this.GridSendKey=cfg.GridSendKey;
|
||||
|
@ -69,14 +69,14 @@ namespace OpenUser.Config.UserConfigDb4o
|
|||
this.DefaultStartupMsg=cfg.DefaultStartupMsg;
|
||||
}
|
||||
} else {
|
||||
MainLog.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
|
||||
MainLog.Instance.Verbose("DbUserConfig.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
|
||||
LoadDefaults();
|
||||
MainLog.Instance.Verbose("Writing out default settings to local database");
|
||||
db.Set(this);
|
||||
db.Close();
|
||||
}
|
||||
} catch(Exception e) {
|
||||
MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
|
||||
MainLog.Instance.Warn("DbUserConfig.cs:InitConfig() - Exception occured");
|
||||
MainLog.Instance.Warn(e.ToString());
|
||||
}
|
||||
|
||||
|
|
|
@ -297,7 +297,7 @@ namespace OpenSim.Region.ClientStack
|
|||
catch (Exception e)
|
||||
{
|
||||
MainLog.Instance.Warn("client",
|
||||
"ClientView API.cs: SendLayerData() - Failed with exception " + e.ToString());
|
||||
"ClientView.API.cs: SendLayerData() - Failed with exception " + e.ToString());
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -324,7 +324,7 @@ namespace OpenSim.Region.ClientStack
|
|||
catch (Exception e)
|
||||
{
|
||||
MainLog.Instance.Warn("client",
|
||||
"ClientView API .cs: SendLayerData() - Failed with exception " + e.ToString());
|
||||
"ClientView.API.cs: SendLayerData() - Failed with exception " + e.ToString());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -158,7 +158,7 @@ namespace OpenSim.Region.ClientStack
|
|||
catch (Exception)
|
||||
{
|
||||
MainLog.Instance.Warn("client",
|
||||
"OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " +
|
||||
"ClientView.PacketQueue.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " +
|
||||
userEP.ToString() + " - killing thread");
|
||||
KillThread();
|
||||
}
|
||||
|
|
|
@ -388,7 +388,7 @@ namespace OpenSim.Region.ClientStack
|
|||
}
|
||||
break;
|
||||
case PacketType.TransferRequest:
|
||||
//Console.WriteLine("OpenSimClient.cs:ProcessInPacket() - Got transfer request");
|
||||
//Console.WriteLine("ClientView.ProcessPackets.cs:ProcessInPacket() - Got transfer request");
|
||||
TransferRequestPacket transfer = (TransferRequestPacket) Pack;
|
||||
m_assetCache.AddAssetRequest(this, transfer);
|
||||
break;
|
||||
|
|
|
@ -497,7 +497,7 @@ namespace OpenSim.Region.Environment.Scenes
|
|||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
MainLog.Instance.Warn("terrain", "World.cs: LoadWorldMap() - Failed with exception " + e.ToString());
|
||||
MainLog.Instance.Warn("terrain", "Scene.cs: LoadWorldMap() - Failed with exception " + e.ToString());
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1079,7 +1079,7 @@ namespace OpenSim.Region.Environment.Scenes
|
|||
/// <param name="agent"></param>
|
||||
public void NewUserConnection(ulong regionHandle, AgentCircuitData agent)
|
||||
{
|
||||
// Console.WriteLine("World.cs - add new user connection");
|
||||
// Console.WriteLine("Scene.cs - add new user connection");
|
||||
//should just check that its meant for this region
|
||||
if (regionHandle == m_regInfo.RegionHandle)
|
||||
{
|
||||
|
|
|
@ -146,7 +146,7 @@ namespace OpenSim.Region.Environment.Scenes
|
|||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
MainLog.Instance.Error("SCENE", "World.cs: Close() - Failed with exception " + e.ToString());
|
||||
MainLog.Instance.Error("SCENE", "SceneBase.cs: Close() - Failed with exception " + e.ToString());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -44,7 +44,7 @@ namespace OpenSim.Region.Environment.Scenes
|
|||
|
||||
public void LoadAnims()
|
||||
{
|
||||
//OpenSim.Framework.Console.MainLog.Instance.Verbose("Avatar.cs:LoadAnims() - Loading avatar animations");
|
||||
//OpenSim.Framework.Console.MainLog.Instance.Verbose("ScenePresence.Animations.cs:LoadAnims() - Loading avatar animations");
|
||||
using (XmlTextReader reader = new XmlTextReader("data/avataranimations.xml"))
|
||||
{
|
||||
XmlDocument doc = new XmlDocument();
|
||||
|
|
Loading…
Reference in New Issue