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

* minor: log message twiddling

0.6.0-stable
Justin Clarke Casey 2008-08-01 20:05:26 +00:00
parent 10e0df0a2d
commit 5350cec0b3
6 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -365,6 +365,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public LLClientView(EndPoint remoteEP, IScene scene, AssetCache assetCache, LLPacketServer packServer,
AgentCircuitManager authenSessions, LLUUID agentId, LLUUID sessionId, uint circuitCode, EndPoint proxyEP)
{
m_log.Info("[CLIENT]: Started up new client thread to handle incoming request");
m_moneyBalance = 1000;
m_channelVersion = Helpers.StringToField(scene.GetSimulatorVersion());
@ -376,9 +378,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_networkServer = packServer;
// m_inventoryCache = inventoryCache;
m_authenticateSessionsHandler = authenSessions;
m_log.Info("[CLIENT]: Started up new client thread to handle incoming request");
m_authenticateSessionsHandler = authenSessions;
m_agentId = agentId;
m_sessionId = sessionId;
@ -399,7 +399,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
RegisterLocalPacketHandlers();
m_clientThread = new Thread(new ThreadStart(AuthUser));
m_clientThread.Name = "ClientThread";
m_clientThread.IsBackground = true;
@ -677,8 +676,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_clientPingTimer = new Timer(5000);
m_clientPingTimer.Elapsed += new ElapsedEventHandler(CheckClientConnectivity);
m_clientPingTimer.Enabled = true;
m_log.Info("[CLIENT]: Adding viewer agent to scene");
m_scene.AddNewClient(this, true);
}

1
OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
View File

@ -382,6 +382,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
if (!(packet is UseCircuitCodePacket))
return;
UseCircuitCodePacket useCircuit = (UseCircuitCodePacket) packet;
lock (clientCircuits)
{

8
OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
View File

@ -289,15 +289,11 @@ namespace OpenSim.Region.Communications.OGS1
if (respData == null || !respData.ContainsKey("returnString"))
{
m_log.Warn("[OSG1 USER SERVICES]: Error updating user record, Grid server may not be updated.");
m_log.Error("[OSG1 USER SERVICES]: Error updating user record, Grid server may not be updated.");
}
else
{
if ((string) respData["returnString"] == "TRUE")
{
m_log.Info("[OSG1 USER SERVICES]: Successfully updated user record");
}
else
if ((string) respData["returnString"] != "TRUE")
{
m_log.Error("[OSG1 USER SERVICES]: Error updating user record");
}

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

@ -555,18 +555,14 @@ namespace OpenSim.Region.Environment.Scenes
protected internal void AddScenePresence(ScenePresence presence)
{
bool child = presence.IsChildAgent;
if (child)
{
m_numChildAgents++;
m_log.Info("[SCENE]" + m_regInfo.RegionName + ": Creating new child agent.");
}
else
{
m_numRootAgents++;
m_log.Info("[SCENE] " + m_regInfo.RegionName + ": Creating new root agent.");
m_log.Info("[SCENE] " + m_regInfo.RegionName + ": Adding Physical agent.");
presence.AddToPhysicalScene();
}

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

@ -1982,16 +1982,12 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="child"></param>
public override void AddNewClient(IClientAPI client, bool child)
{
m_log.DebugFormat(
"[CONNECTION DEBUGGING]: Creating new client for {0} at {1}",
client.AgentId, RegionInfo.RegionName);
SubscribeToClientEvents(client);
ScenePresence presence;
if (m_restorePresences.ContainsKey(client.AgentId))
{
m_log.Info("[REGION]: Restoring Scene Presence");
m_log.DebugFormat("[SCENE]: Restoring agent {0} {1} in {2}", client.Name, client.AgentId, RegionInfo.RegionName);
presence = m_restorePresences[client.AgentId];
m_restorePresences.Remove(client.AgentId);
@ -2015,7 +2011,9 @@ namespace OpenSim.Region.Environment.Scenes
}
else
{
m_log.Info("[REGION]: Adding New Scene Presence");
m_log.DebugFormat(
"[SCENE]: Adding new {0} agent {1} {2} in {3}",
(child ? "child" : "root"), client.Name, client.AgentId, RegionInfo.RegionName);
CommsManager.UserProfileCacheService.AddNewUser(client);
@ -2263,6 +2261,10 @@ namespace OpenSim.Region.Environment.Scenes
}
try
{
m_log.DebugFormat(
"[SCENE]: Removing {0} agent {1} from region {2}",
(childagentYN ? "child" : "root"), agentID, RegionInfo.RegionName);
if (avatar.IsChildAgent)
{
m_innerScene.removeUserCount(false);

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

@ -654,7 +654,7 @@ namespace OpenSim.Region.Environment.Scenes
m_animations.Clear();
// m_log.DebugFormat(
// "[SCENEPRESENCE]: Downgrading child agent {0}, {1} to a root agent in {2}",
// "[SCENEPRESENCE]: Downgrading root agent {0}, {1} to a child agent in {2}",
// Name, UUID, m_scene.RegionInfo.RegionName);
Velocity = new LLVector3(0, 0, 0);