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

* Added and removed debug information relating to client connections 

* Minor client fixes
* Added the ability for a client to login without a UserProfile, allowing certain alternate clients to connect to the region.
0.6.1-post-fixes
Adam Frisby 2008-11-18 00:47:30 +00:00
parent 6fd8960064
commit 434afaf717
6 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Framework/ClientManager.cs
View File

@ -49,8 +49,7 @@ namespace OpenSim.Framework
public void ForEachClient(ForEachClientDelegate whatToDo) public void ForEachClient(ForEachClientDelegate whatToDo)
{ {
// Wasteful, I know IClientAPI[] LocalClients;
IClientAPI[] LocalClients = new IClientAPI[0];
lock (m_clients) lock (m_clients)
{ {
LocalClients = new IClientAPI[m_clients.Count]; LocalClients = new IClientAPI[m_clients.Count];

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

@ -166,7 +166,7 @@ namespace OpenSim.Framework.Communications
} }
else if (requestData.Contains("web_login_key")) else if (requestData.Contains("web_login_key"))
{ {
UUID webloginkey = UUID.Zero; UUID webloginkey;
try try
{ {
webloginkey = new UUID((string)requestData["web_login_key"]); webloginkey = new UUID((string)requestData["web_login_key"]);

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

@ -775,7 +775,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// Don't let a failure in an individual client thread crash the whole sim. // Don't let a failure in an individual client thread crash the whole sim.
m_log.ErrorFormat( m_log.ErrorFormat(
"[CLIENT]: Client thread for {0} {1} crashed. Logging them out. Exception {2}", Name, AgentId, e); "[CLIENT]: Client thread for {0} {1} crashed. Logging them out.", Name, AgentId);
m_log.Error(e.ToString());
try try
{ {

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

@ -89,6 +89,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{ {
m_localScene = value; m_localScene = value;
m_packetServer.LocalScene = m_localScene; m_packetServer.LocalScene = m_localScene;
m_location = new Location(m_localScene.RegionInfo.RegionHandle); m_location = new Location(m_localScene.RegionInfo.RegionHandle);
} }
} }
@ -404,6 +405,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// <param name="epProxy"></param> /// <param name="epProxy"></param>
protected virtual void AddNewClient(UseCircuitCodePacket useCircuit, EndPoint epSender, EndPoint epProxy) protected virtual void AddNewClient(UseCircuitCodePacket useCircuit, EndPoint epSender, EndPoint epProxy)
{ {
m_log.Debug("[CONNECTION DEBUGGING] AddNewClient Called");
//Slave regions don't accept new clients //Slave regions don't accept new clients
if (m_localScene.Region_Status != RegionStatus.SlaveScene) if (m_localScene.Region_Status != RegionStatus.SlaveScene)
{ {

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

@ -2746,6 +2746,9 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="agent"></param> /// <param name="agent"></param>
public void NewUserConnection(AgentCircuitData agent) public void NewUserConnection(AgentCircuitData agent)
{ {
m_log.DebugFormat("[CONNECTION DEBUGGING] Adding NewUserConnection for {0} with CC of {1}", agent.AgentID,
agent.circuitcode);
if (m_regInfo.EstateSettings.IsBanned(agent.AgentID)) if (m_regInfo.EstateSettings.IsBanned(agent.AgentID))
{ {
m_log.WarnFormat( m_log.WarnFormat(

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

@ -510,8 +510,9 @@ namespace OpenSim.Region.Environment.Scenes
RegisterToEvents(); RegisterToEvents();
SetDirectionVectors(); SetDirectionVectors();
CachedUserInfo userInfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(m_uuid); CachedUserInfo userInfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(m_uuid);
userInfo.OnItemReceived += ItemReceived; if (userInfo != null)
userInfo.OnItemReceived += ItemReceived;
} }
public ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo, byte[] visualParams, public ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo, byte[] visualParams,