From d4144bedb81346301162f1e20266561fea7b621e Mon Sep 17 00:00:00 2001
From: Jonathan Freedman
Date: Thu, 21 Oct 2010 23:22:15 -0400
Subject: * change the data exchanged within hypergrid transactions

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 0cfc235..2750168 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3740,9 +3740,12 @@ namespace OpenSim.Region.Framework.Scenes
 
             // We have to wait until the viewer contacts this region after receiving EAC.
             // That calls AddNewClient, which finally creates the ScenePresence
+            m_log.Debug("ICADU -> pre wait");
             ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID);
+            m_log.Debug("ICADU -> post wait");
             if (childAgentUpdate != null)
             {
+                m_log.Debug("ICADU -> not child agent!");
                 childAgentUpdate.ChildAgentDataUpdate(cAgentData);
                 return true;
             }
@@ -3758,7 +3761,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns>true if we handled it.</returns>
         public virtual bool IncomingChildAgentDataUpdate(AgentPosition cAgentData)
         {
-            //m_log.Debug(" XXX Scene IncomingChildAgentDataUpdate POSITION in " + RegionInfo.RegionName);
+            m_log.Debug(" XXX Scene IncomingChildAgentDataUpdate POSITION in " + RegionInfo.RegionName);
             ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID);
             if (childAgentUpdate != null)
             {
-- 
cgit v1.1


From 004b395d12b4e369005a4f4a0a44a86bd278e781 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 21 Oct 2010 15:36:32 +0100
Subject: Make SImStatsReporter pick ObjectCapacity striaght out of region info

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 2 --
 1 file changed, 2 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 0cfc235..c9ae558 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -599,8 +599,6 @@ namespace OpenSim.Region.Framework.Scenes
             StatsReporter.OnSendStatsResult += SendSimStatsPackets;
             StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats;
 
-            StatsReporter.SetObjectCapacity(RegionInfo.ObjectCapacity);
-
             // Old
             /*
             m_simulatorVersion = simulatorVersion
-- 
cgit v1.1