aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs23
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs11
7 files changed, 35 insertions, 17 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 18b5acf..8189501 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -445,8 +445,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
445 } 445 }
446 446
447 m_log.DebugFormat( 447 m_log.DebugFormat(
448 "[CONNECTION SUCCESS]: Incoming client {0} (circuit code {1}) received and authenticated", 448 "[CONNECTION SUCCESS]: Incoming client {0} (circuit code {1}) received and authenticated for {2}",
449 useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code); 449 useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code, m_localScene.RegionInfo.RegionName);
450 } 450 }
451 451
452 // Ack the UseCircuitCode packet 452 // Ack the UseCircuitCode packet
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
index 3071026..a1940ae 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
@@ -1378,7 +1378,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
1378 if (m_rootAgents[avatar.UUID] == avatar.Scene.RegionInfo.originRegionID) 1378 if (m_rootAgents[avatar.UUID] == avatar.Scene.RegionInfo.originRegionID)
1379 { 1379 {
1380 m_rootAgents.Remove(avatar.UUID); 1380 m_rootAgents.Remove(avatar.UUID);
1381 m_log.Info("[MONEY]: Removing " + avatar.Firstname + " " + avatar.Lastname + " as a root agent"); 1381// m_log.Debug("[MONEY]: Removing " + avatar.Firstname + " " + avatar.Lastname + " as a root agent");
1382 } 1382 }
1383 } 1383 }
1384 } 1384 }
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
index 9efaf81..6c1c001 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
@@ -329,7 +329,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
329 if (m_rootAgents[avatar.UUID] == avatar.RegionHandle) 329 if (m_rootAgents[avatar.UUID] == avatar.RegionHandle)
330 { 330 {
331 m_rootAgents.Remove(avatar.UUID); 331 m_rootAgents.Remove(avatar.UUID);
332 m_log.Debug("[FRIEND]: Removing " + avatar.Firstname + " " + avatar.Lastname + " as a root agent"); 332// m_log.Debug("[FRIEND]: Removing " + avatar.Firstname + " " + avatar.Lastname + " as a root agent");
333 } 333 }
334 } 334 }
335 } 335 }
diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
index bb7406f..6bcc77e 100644
--- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
@@ -338,7 +338,9 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
338 if (avatar.Scene.NeedSceneCacheClear(avatar.UUID) || isHyperLink) 338 if (avatar.Scene.NeedSceneCacheClear(avatar.UUID) || isHyperLink)
339 { 339 {
340 m_commsProvider.UserProfileCacheService.RemoveUser(avatar.UUID); 340 m_commsProvider.UserProfileCacheService.RemoveUser(avatar.UUID);
341 m_log.InfoFormat("[HGSceneCommService]: User {0} is going to another region, profile cache removed", avatar.UUID); 341 m_log.DebugFormat(
342 "[HGSceneCommService]: User {0} is going to another region, profile cache removed",
343 avatar.UUID);
342 } 344 }
343 } 345 }
344 else 346 else
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 11655e9..4ff4c0e 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2759,15 +2759,15 @@ namespace OpenSim.Region.Environment.Scenes
2759 /// <param name="agent"></param> 2759 /// <param name="agent"></param>
2760 public void NewUserConnection(AgentCircuitData agent) 2760 public void NewUserConnection(AgentCircuitData agent)
2761 { 2761 {
2762 // Don't disable this log messages - it's too useful 2762 // Don't disable this log message - it's too helpful
2763 m_log.DebugFormat( 2763 m_log.DebugFormat(
2764 "[CONNECTION SETUP]: Scene {0} told of incoming client {1} {2} {3} (circuit code {4})", 2764 "[CONNECTION BEGIN]: Scene {0} told of incoming client {1} {2} {3} (circuit code {4})",
2765 RegionInfo.RegionName, agent.firstname, agent.lastname, agent.AgentID, agent.circuitcode); 2765 RegionInfo.RegionName, agent.firstname, agent.lastname, agent.AgentID, agent.circuitcode);
2766 2766
2767 if (m_regInfo.EstateSettings.IsBanned(agent.AgentID)) 2767 if (m_regInfo.EstateSettings.IsBanned(agent.AgentID))
2768 { 2768 {
2769 m_log.WarnFormat( 2769 m_log.WarnFormat(
2770 "[CONNECTION SETUP]: Denied access to: {0} at {1} because the user is on the region banlist", 2770 "[CONNECTION BEGIN]: Denied access to: {0} at {1} because the user is on the region banlist",
2771 agent.AgentID, RegionInfo.RegionName); 2771 agent.AgentID, RegionInfo.RegionName);
2772 } 2772 }
2773 2773
@@ -2778,11 +2778,22 @@ namespace OpenSim.Region.Environment.Scenes
2778 ScenePresence sp = m_sceneGraph.GetScenePresence(agent.AgentID); 2778 ScenePresence sp = m_sceneGraph.GetScenePresence(agent.AgentID);
2779 if (sp != null) 2779 if (sp != null)
2780 { 2780 {
2781 m_log.DebugFormat( 2781 if (sp.IsChildAgent)
2782 "[CONNECTION SETUP]: Updated existing agent {0} in {1}", agent.AgentID, RegionInfo.RegionName); 2782 m_log.DebugFormat(
2783 "[CONNECTION BEGIN]: Incoming client for {0} is existing child agent {1}",
2784 RegionInfo.RegionName, agent.AgentID);
2785 else
2786 m_log.DebugFormat(
2787 "[CONNECTION BEGIN]: Incoming client for {0} is existing root agent {1}",
2788 RegionInfo.RegionName, agent.AgentID);
2789
2790// m_log.DebugFormat(
2791// "[CONNECTION BEGIN]: Updated existing agent {0} in {1}", agent.AgentID, RegionInfo.RegionName);
2792
2783 sp.AdjustKnownSeeds(); 2793 sp.AdjustKnownSeeds();
2784 sp.AbsolutePosition = agent.startpos; 2794 sp.AbsolutePosition = agent.startpos;
2785 m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent); 2795 m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
2796
2786 return; 2797 return;
2787 } 2798 }
2788 2799
@@ -2813,7 +2824,7 @@ namespace OpenSim.Region.Environment.Scenes
2813 else 2824 else
2814 { 2825 {
2815 m_log.WarnFormat( 2826 m_log.WarnFormat(
2816 "[CONNECTION SETUP]: We couldn't find a User Info record for {0}. This is usually an indication that the UUID we're looking up is invalid", agent.AgentID); 2827 "[CONNECTION BEGIN]: We couldn't find a User Info record for {0}. This is usually an indication that the UUID we're looking up is invalid", agent.AgentID);
2817 } 2828 }
2818 } 2829 }
2819 2830
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 7997fba..ab4e7d8 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -916,10 +916,10 @@ namespace OpenSim.Region.Environment.Scenes
916 if (avatar.Scene.NeedSceneCacheClear(avatar.UUID)) 916 if (avatar.Scene.NeedSceneCacheClear(avatar.UUID))
917 { 917 {
918 m_commsProvider.UserProfileCacheService.RemoveUser(avatar.UUID); 918 m_commsProvider.UserProfileCacheService.RemoveUser(avatar.UUID);
919 m_log.InfoFormat("User {0} is going to another region, profile cache removed", avatar.UUID); 919 m_log.DebugFormat(
920 "[SCENE COMMUNICATION SERVICE]: User {0} is going to another region, profile cache removed",
921 avatar.UUID);
920 } 922 }
921
922
923 } 923 }
924 else 924 else
925 { 925 {
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 1a3971d..00e5548 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -2483,7 +2483,8 @@ namespace OpenSim.Region.Environment.Scenes
2483 if (m_scene.NeedSceneCacheClear(UUID)) 2483 if (m_scene.NeedSceneCacheClear(UUID))
2484 { 2484 {
2485 m_scene.CommsManager.UserProfileCacheService.RemoveUser(UUID); 2485 m_scene.CommsManager.UserProfileCacheService.RemoveUser(UUID);
2486 m_log.InfoFormat("[AVATAR]: User {0} is going to another region, profile cache removed", UUID); 2486 m_log.DebugFormat(
2487 "[SCENE PRESENCE]: User {0} is going to another region, profile cache removed", UUID);
2487 } 2488 }
2488 } 2489 }
2489 else 2490 else
@@ -2510,7 +2511,9 @@ namespace OpenSim.Region.Environment.Scenes
2510 public void CloseChildAgents(uint newRegionX, uint newRegionY) 2511 public void CloseChildAgents(uint newRegionX, uint newRegionY)
2511 { 2512 {
2512 List<ulong> byebyeRegions = new List<ulong>(); 2513 List<ulong> byebyeRegions = new List<ulong>();
2513 m_log.DebugFormat("[AVATAR]: Closing child agents. Checking {0} regions in {1}", m_knownChildRegions.Keys.Count, Scene.RegionInfo.RegionName); 2514 m_log.DebugFormat(
2515 "[SCENE PRESENCE]: Closing child agents. Checking {0} regions in {1}",
2516 m_knownChildRegions.Keys.Count, Scene.RegionInfo.RegionName);
2514 //DumpKnownRegions(); 2517 //DumpKnownRegions();
2515 2518
2516 lock (m_knownChildRegions) 2519 lock (m_knownChildRegions)
@@ -2534,11 +2537,13 @@ namespace OpenSim.Region.Environment.Scenes
2534 } 2537 }
2535 } 2538 }
2536 } 2539 }
2540
2537 if (byebyeRegions.Count > 0) 2541 if (byebyeRegions.Count > 0)
2538 { 2542 {
2539 m_log.Info("[AVATAR]: Closing " + byebyeRegions.Count + " child agents"); 2543 m_log.Debug("[SCENE PRESENCE]: Closing " + byebyeRegions.Count + " child agents");
2540 m_scene.SceneGridService.SendCloseChildAgentConnections(m_controllingClient.AgentId, byebyeRegions); 2544 m_scene.SceneGridService.SendCloseChildAgentConnections(m_controllingClient.AgentId, byebyeRegions);
2541 } 2545 }
2546
2542 foreach (ulong handle in byebyeRegions) 2547 foreach (ulong handle in byebyeRegions)
2543 { 2548 {
2544 RemoveNeighbourRegion(handle); 2549 RemoveNeighbourRegion(handle);