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

* Massaging CAPS setup/teardown log messages 

* Leaving quite a few debug messages in for now to help deal with bugs arising
0.6.0-stable
Justin Clarke Casey 2008-03-25 22:04:41 +00:00
parent ad808579a2
commit ad6783ff40
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Grid/UserServer/UserLoginService.cs
View File

@ -147,6 +147,10 @@ namespace OpenSim.Grid.UserServer
string capsPath = Util.GetRandomCapsPath(); string capsPath = Util.GetRandomCapsPath();
response.SeedCapability = SimInfo.httpServerURI + "CAPS/" + capsPath + "0000/"; response.SeedCapability = SimInfo.httpServerURI + "CAPS/" + capsPath + "0000/";
m_log.DebugFormat(
"[CAPS]: Sending new CAPS seed url {0} to client {1}",
response.SeedCapability, response.AgentID);
// Notify the target of an incoming user // Notify the target of an incoming user
//CFK: The "Notifying" message always seems to appear, so subsume the data from this message into //CFK: The "Notifying" message always seems to appear, so subsume the data from this message into
//CFK: the next one for X & Y and comment this one. //CFK: the next one for X & Y and comment this one.

6
OpenSim/Region/Communications/Local/LocalLoginService.cs
View File

@ -159,7 +159,11 @@ namespace OpenSim.Region.Communications.Local
response.SeedCapability = "http://" + reg.ExternalHostName + ":" + response.SeedCapability = "http://" + reg.ExternalHostName + ":" +
serversInfo.HttpListenerPort.ToString() + "/CAPS/" + capsPath + "0000/"; serversInfo.HttpListenerPort.ToString() + "/CAPS/" + capsPath + "0000/";
// response.SeedCapability = "http://" + reg.ExternalHostName + ":" + this.serversInfo.HttpListenerPort.ToString() + "/CapsSeed/" + capsPath + "0000/";
m_log.DebugFormat(
"[CAPS]: Sending new CAPS seed url {0} to client {1}",
response.SeedCapability, response.AgentID);
theUser.currentAgent.currentRegion = reg.RegionID; theUser.currentAgent.currentRegion = reg.RegionID;
theUser.currentAgent.currentHandle = reg.RegionHandle; theUser.currentAgent.currentHandle = reg.RegionHandle;

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

@ -1713,7 +1713,7 @@ namespace OpenSim.Region.Environment.Scenes
String capsObjectPath = GetCapsPath(agentId); String capsObjectPath = GetCapsPath(agentId);
m_log.DebugFormat( m_log.DebugFormat(
"[CONNECTION DEBUGGING]: Setting up CAPS handler for avatar {0} in {1}", "[CAPS]: Setting up CAPS handler for root agent {0} in {1}",
agentId, RegionInfo.RegionName); agentId, RegionInfo.RegionName);
Caps cap = Caps cap =
@ -1739,7 +1739,7 @@ namespace OpenSim.Region.Environment.Scenes
if (m_capsHandlers.ContainsKey(agentId)) if (m_capsHandlers.ContainsKey(agentId))
{ {
m_log.DebugFormat( m_log.DebugFormat(
"[CONNECTION DEBUGGING]: Removing CAPS handler for root agent {0} in {1}", "[CAPS]: Removing CAPS handler for root agent {0} in {1}",
agentId, RegionInfo.RegionName); agentId, RegionInfo.RegionName);
m_capsHandlers[agentId].DeregisterHandlers(); m_capsHandlers[agentId].DeregisterHandlers();
@ -1748,7 +1748,7 @@ namespace OpenSim.Region.Environment.Scenes
else else
{ {
m_log.WarnFormat( m_log.WarnFormat(
"[CONNECTION DEBUGGING]: Received request to remove CAPS handler for root agent {0} in {1}, but no such CAPS handler found!", "[CAPS]: Received request to remove CAPS handler for root agent {0} in {1}, but no such CAPS handler found!",
agentId, RegionInfo.RegionName); agentId, RegionInfo.RegionName);
} }
} }

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

@ -568,7 +568,7 @@ namespace OpenSim.Region.Environment.Scenes
+ "/CAPS/" + circuitdata.CapsPath + "0000/"; + "/CAPS/" + circuitdata.CapsPath + "0000/";
m_log.DebugFormat( m_log.DebugFormat(
"[CONNECTION DEBUGGING]: Sending new CAPS seed url {0} to avatar {1}", capsPath, avatar.UUID); "[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, avatar.UUID);
avatar.ControllingClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4), avatar.ControllingClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4),
capsPath); capsPath);

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

@ -1637,7 +1637,7 @@ namespace OpenSim.Region.Environment.Scenes
+ "/CAPS/" + circuitdata.CapsPath + "0000/"; + "/CAPS/" + circuitdata.CapsPath + "0000/";
m_log.DebugFormat( m_log.DebugFormat(
"[CONNECTION DEBUGGING]: Sending new CAPS seed url {0} to avatar {1}", capsPath, m_uuid); "[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, m_uuid);
m_controllingClient.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint, m_controllingClient.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint,
capsPath); capsPath);