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

Merge branch 'TeleportWork'

Browse Source
This commit is contained in:
Justin Clark-Casey (justincc)
2013-08-09 17:52:29 +01:00
parent 2cdcf62b48 6fcbf219da
commit 97bcb59bee
8 changed files with 270 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
View File

@@ -91,7 +91,7 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
public void RemoveForClient()
{
TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure();
// TestHelpers.EnableLogging();
UUID spId = TestHelpers.ParseTail(0x1);

6
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@@ -512,7 +512,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// We still perform a force close inside the sync lock since this is intended to attempt close where
// there is some unidentified connection problem, not where we have issues due to deadlock
if (!IsActive && !force)
{
m_log.DebugFormat(
"[CLIENT]: Not attempting to close inactive client {0} in {1} since force flag is not set",
Name, m_scene.Name);
return;
}
IsActive = false;
CloseWithoutChecks();

6
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
View File

@@ -1799,9 +1799,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (!client.SceneAgent.IsChildAgent)
client.Kick("Simulator logged you out due to connection timeout.");
client.CloseWithoutChecks();
}
m_scene.IncomingCloseAgent(client.AgentId, true);
}
private void IncomingPacketHandler()
@@ -2142,7 +2142,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (!client.IsLoggingOut)
{
client.IsLoggingOut = true;
client.Close();
m_scene.IncomingCloseAgent(client.AgentId, false);
}
}
}

2
OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
View File

@@ -200,7 +200,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
public void TestLogoutClientDueToAck()
{
TestHelpers.InMethod();
// TestHelpers.EnableLogging();
TestHelpers.EnableLogging();
IniConfigSource ics = new IniConfigSource();
IConfig config = ics.AddConfig("ClientStack.LindenUDP");