OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Removed plenty more untagged console messages. Everything now has shiny groups. :)

afrisby
Adam Frisby 2007-10-22 22:37:39 +00:00
parent 3e5fcf90aa
commit 3143768468
8 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Communications/Capabilities/Caps.cs
View File

@ -77,7 +77,7 @@ namespace OpenSim.Region.Capabilities
/// </summary> /// </summary>
public void RegisterHandlers() public void RegisterHandlers()
{ {
Console.WriteLine("registering CAPS handlers"); OpenSim.Framework.Console.MainLog.Instance.Verbose("CAPS","Registering CAPS handlers");
string capsBase = "/CAPS/" + m_capsObjectPath; string capsBase = "/CAPS/" + m_capsObjectPath;
try try
{ {

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

@ -199,8 +199,7 @@ namespace OpenSim.Framework.UserManagement
public virtual bool AuthenticateUser(UserProfileData profile, string password) public virtual bool AuthenticateUser(UserProfileData profile, string password)
{ {
MainLog.Instance.Verbose( MainLog.Instance.Verbose("LOGIN","Authenticating " + profile.username + " " + profile.surname);
"Authenticating " + profile.username + " " + profile.surname);
password = password.Remove(0, 3); //remove $1$ password = password.Remove(0, 3); //remove $1$

2
OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
View File

@ -207,7 +207,7 @@ namespace OpenSim.Framework.Data.SQLite
fillUserAgentRow(row, user.currentAgent); fillUserAgentRow(row, user.currentAgent);
} }
} }
MainLog.Instance.Verbose("Syncing user database: " + ds.Tables["users"].Rows.Count + " users stored"); MainLog.Instance.Verbose("SQLITE", "Syncing user database: " + ds.Tables["users"].Rows.Count + " users stored");
// save changes off to disk // save changes off to disk
da.Update(ds, "users"); da.Update(ds, "users");
} }

2
OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
View File

@ -56,7 +56,7 @@ namespace OpenSim.Region.ClientStack
protected virtual bool Logout(IClientAPI client, Packet packet) protected virtual bool Logout(IClientAPI client, Packet packet)
{ {
MainLog.Instance.Verbose("OpenSimClient.cs:ProcessInPacket() - Got a logout request"); MainLog.Instance.Verbose("CLIENT", "Got a logout request");
if( OnLogout != null ) if( OnLogout != null )
{ {

10
OpenSim/Region/ClientStack/ClientView.cs
View File

@ -100,7 +100,7 @@ namespace OpenSim.Region.ClientStack
// m_inventoryCache = inventoryCache; // m_inventoryCache = inventoryCache;
m_authenticateSessionsHandler = authenSessions; m_authenticateSessionsHandler = authenSessions;
MainLog.Instance.Verbose("OpenSimClient.cs - Started up new client thread to handle incoming request"); MainLog.Instance.Verbose("CLIENT","Started up new client thread to handle incoming request");
cirpack = initialcirpack; cirpack = initialcirpack;
userEP = remoteEP; userEP = remoteEP;
@ -224,7 +224,7 @@ namespace OpenSim.Region.ClientStack
protected virtual void ClientLoop() protected virtual void ClientLoop()
{ {
MainLog.Instance.Verbose("OpenSimClient.cs:ClientLoop() - Entered loop"); MainLog.Instance.Verbose("CLIENT", "Entered loop");
while (true) while (true)
{ {
QueItem nextPacket = PacketQueue.Dequeue(); QueItem nextPacket = PacketQueue.Dequeue();
@ -282,7 +282,7 @@ namespace OpenSim.Region.ClientStack
clientPingTimer.Elapsed += new ElapsedEventHandler(CheckClientConnectivity); clientPingTimer.Elapsed += new ElapsedEventHandler(CheckClientConnectivity);
clientPingTimer.Enabled = true; clientPingTimer.Enabled = true;
MainLog.Instance.Verbose("OpenSimClient.cs:InitNewClient() - Adding viewer agent to scene"); MainLog.Instance.Verbose("CLIENT","Adding viewer agent to scene");
this.m_scene.AddNewClient(this, true); this.m_scene.AddNewClient(this, true);
} }
@ -293,12 +293,12 @@ namespace OpenSim.Region.ClientStack
if (!sessionInfo.Authorised) if (!sessionInfo.Authorised)
{ {
//session/circuit not authorised //session/circuit not authorised
MainLog.Instance.Notice("OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString()); MainLog.Instance.Notice("CLIENT", "New user request denied to " + userEP.ToString());
ClientThread.Abort(); ClientThread.Abort();
} }
else else
{ {
MainLog.Instance.Notice("OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString()); MainLog.Instance.Notice("CLIENT", "Got authenticated connection from " + userEP.ToString());
//session is authorised //session is authorised
m_agentId = cirpack.CircuitCode.ID; m_agentId = cirpack.CircuitCode.ID;
this.m_sessionId = cirpack.CircuitCode.SessionID; this.m_sessionId = cirpack.CircuitCode.SessionID;

6
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -859,14 +859,14 @@ namespace OpenSim.Region.Environment.Scenes
if (child) if (child)
{ {
MainLog.Instance.Verbose(RegionInfo.RegionName + ": Creating new child agent."); MainLog.Instance.Verbose("SCENE", RegionInfo.RegionName + ": Creating new child agent.");
} }
else else
{ {
newAvatar.OnSignificantClientMovement += m_LandManager.handleSignificantClientMovement; newAvatar.OnSignificantClientMovement += m_LandManager.handleSignificantClientMovement;
MainLog.Instance.Verbose(RegionInfo.RegionName + ": Creating new root agent."); MainLog.Instance.Verbose("SCENE", RegionInfo.RegionName + ": Creating new root agent.");
MainLog.Instance.Verbose(RegionInfo.RegionName + ": Adding Physical agent."); MainLog.Instance.Verbose("SCENE", RegionInfo.RegionName + ": Adding Physical agent.");
newAvatar.AddToPhysicalScene(); newAvatar.AddToPhysicalScene();
} }

1
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -234,7 +234,6 @@ namespace OpenSim.Region.Environment.Scenes
m_regionInfo = reginfo; m_regionInfo = reginfo;
m_regionHandle = reginfo.RegionHandle; m_regionHandle = reginfo.RegionHandle;
MainLog.Instance.Verbose("Avatar.cs ");
m_controllingClient = client; m_controllingClient = client;
m_firstname = m_controllingClient.FirstName; m_firstname = m_controllingClient.FirstName;
m_lastname = m_controllingClient.LastName; m_lastname = m_controllingClient.LastName;

10
OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
View File

@ -98,11 +98,19 @@ namespace OpenSim.DataStore.MonoSqlite
try try
{ {
shapeDa.Fill(ds.Tables["primshapes"]); shapeDa.Fill(ds.Tables["primshapes"]);
}
catch (Exception)
{
MainLog.Instance.Verbose("DATASTORE", "Caught fill error on primshapes table");
}
try
{
terrainDa.Fill(ds.Tables["terrain"]); terrainDa.Fill(ds.Tables["terrain"]);
} }
catch (Exception) catch (Exception)
{ {
MainLog.Instance.Verbose("DATASTORE", "Caught fill error on primshapes or terrain table"); MainLog.Instance.Verbose("DATASTORE", "Caught fill error on terrain table");
} }
return; return;
} }