aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorAdam Frisby2008-11-18 00:47:30 +0000
committerAdam Frisby2008-11-18 00:47:30 +0000
commit434afaf717eef01f26b6b95ba8b4ae50fc470a4c (patch)
tree149637356d5a88ea2320fb3f56fd157c40cd41b1 /OpenSim/Region/Environment
parentPrevent the texture downloader from locking a null object when a download (diff)
downloadopensim-SC_OLD-434afaf717eef01f26b6b95ba8b4ae50fc470a4c.zip
opensim-SC_OLD-434afaf717eef01f26b6b95ba8b4ae50fc470a4c.tar.gz
opensim-SC_OLD-434afaf717eef01f26b6b95ba8b4ae50fc470a4c.tar.bz2
opensim-SC_OLD-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/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs5
2 files changed, 6 insertions, 2 deletions
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,