aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/ClientManager.cs3
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs3
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs5
6 files changed, 13 insertions, 6 deletions
diff --git a/OpenSim/Framework/ClientManager.cs b/OpenSim/Framework/ClientManager.cs
index 1bb9836..cdccf0e 100644
--- a/OpenSim/Framework/ClientManager.cs
+++ b/OpenSim/Framework/ClientManager.cs
@@ -49,8 +49,7 @@ namespace OpenSim.Framework
49 49
50 public void ForEachClient(ForEachClientDelegate whatToDo) 50 public void ForEachClient(ForEachClientDelegate whatToDo)
51 { 51 {
52 // Wasteful, I know 52 IClientAPI[] LocalClients;
53 IClientAPI[] LocalClients = new IClientAPI[0];
54 lock (m_clients) 53 lock (m_clients)
55 { 54 {
56 LocalClients = new IClientAPI[m_clients.Count]; 55 LocalClients = new IClientAPI[m_clients.Count];
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index c569a71..b4ee069 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -166,7 +166,7 @@ namespace OpenSim.Framework.Communications
166 } 166 }
167 else if (requestData.Contains("web_login_key")) 167 else if (requestData.Contains("web_login_key"))
168 { 168 {
169 UUID webloginkey = UUID.Zero; 169 UUID webloginkey;
170 try 170 try
171 { 171 {
172 webloginkey = new UUID((string)requestData["web_login_key"]); 172 webloginkey = new UUID((string)requestData["web_login_key"]);
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,