diff options
author | Adam Frisby | 2008-11-18 00:47:30 +0000 |
---|---|---|
committer | Adam Frisby | 2008-11-18 00:47:30 +0000 |
commit | 434afaf717eef01f26b6b95ba8b4ae50fc470a4c (patch) | |
tree | 149637356d5a88ea2320fb3f56fd157c40cd41b1 /OpenSim/Region | |
parent | Prevent the texture downloader from locking a null object when a download (diff) | |
download | opensim-SC-434afaf717eef01f26b6b95ba8b4ae50fc470a4c.zip opensim-SC-434afaf717eef01f26b6b95ba8b4ae50fc470a4c.tar.gz opensim-SC-434afaf717eef01f26b6b95ba8b4ae50fc470a4c.tar.bz2 opensim-SC-434afaf717eef01f26b6b95ba8b4ae50fc470a4c.tar.xz |
* 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.
Diffstat (limited to 'OpenSim/Region')
4 files changed, 11 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index b9bc888..3265817 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -775,7 +775,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
775 | 775 | ||
776 | // Don't let a failure in an individual client thread crash the whole sim. | 776 | // Don't let a failure in an individual client thread crash the whole sim. |
777 | m_log.ErrorFormat( | 777 | m_log.ErrorFormat( |
778 | "[CLIENT]: Client thread for {0} {1} crashed. Logging them out. Exception {2}", Name, AgentId, e); | 778 | "[CLIENT]: Client thread for {0} {1} crashed. Logging them out.", Name, AgentId); |
779 | m_log.Error(e.ToString()); | ||
779 | 780 | ||
780 | try | 781 | try |
781 | { | 782 | { |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index b6aa961..01f2a09 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | |||
@@ -89,6 +89,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
89 | { | 89 | { |
90 | m_localScene = value; | 90 | m_localScene = value; |
91 | m_packetServer.LocalScene = m_localScene; | 91 | m_packetServer.LocalScene = m_localScene; |
92 | |||
92 | m_location = new Location(m_localScene.RegionInfo.RegionHandle); | 93 | m_location = new Location(m_localScene.RegionInfo.RegionHandle); |
93 | } | 94 | } |
94 | } | 95 | } |
@@ -404,6 +405,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
404 | /// <param name="epProxy"></param> | 405 | /// <param name="epProxy"></param> |
405 | protected virtual void AddNewClient(UseCircuitCodePacket useCircuit, EndPoint epSender, EndPoint epProxy) | 406 | protected virtual void AddNewClient(UseCircuitCodePacket useCircuit, EndPoint epSender, EndPoint epProxy) |
406 | { | 407 | { |
408 | m_log.Debug("[CONNECTION DEBUGGING] AddNewClient Called"); | ||
409 | |||
407 | //Slave regions don't accept new clients | 410 | //Slave regions don't accept new clients |
408 | if (m_localScene.Region_Status != RegionStatus.SlaveScene) | 411 | if (m_localScene.Region_Status != RegionStatus.SlaveScene) |
409 | { | 412 | { |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 2287f99..e374bba 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -2746,6 +2746,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
2746 | /// <param name="agent"></param> | 2746 | /// <param name="agent"></param> |
2747 | public void NewUserConnection(AgentCircuitData agent) | 2747 | public void NewUserConnection(AgentCircuitData agent) |
2748 | { | 2748 | { |
2749 | m_log.DebugFormat("[CONNECTION DEBUGGING] Adding NewUserConnection for {0} with CC of {1}", agent.AgentID, | ||
2750 | agent.circuitcode); | ||
2751 | |||
2749 | if (m_regInfo.EstateSettings.IsBanned(agent.AgentID)) | 2752 | if (m_regInfo.EstateSettings.IsBanned(agent.AgentID)) |
2750 | { | 2753 | { |
2751 | m_log.WarnFormat( | 2754 | m_log.WarnFormat( |
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 3c51aa6..19f0f9c 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -510,8 +510,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
510 | RegisterToEvents(); | 510 | RegisterToEvents(); |
511 | SetDirectionVectors(); | 511 | SetDirectionVectors(); |
512 | 512 | ||
513 | CachedUserInfo userInfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(m_uuid); | 513 | CachedUserInfo userInfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(m_uuid); |
514 | userInfo.OnItemReceived += ItemReceived; | 514 | if (userInfo != null) |
515 | userInfo.OnItemReceived += ItemReceived; | ||
515 | } | 516 | } |
516 | 517 | ||
517 | public ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo, byte[] visualParams, | 518 | public ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo, byte[] visualParams, |