aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorDiva Canto2010-12-05 19:43:24 -0800
committerDiva Canto2010-12-05 19:43:24 -0800
commit72748746d53df1c033207452a4315d93bc780158 (patch)
treee50bf963b16737946c0717ee42779b2aa5e3ff8d /OpenSim/Region/Framework
parentMerge branch 'master-core' into mantis5110 (diff)
downloadopensim-SC_OLD-72748746d53df1c033207452a4315d93bc780158.zip
opensim-SC_OLD-72748746d53df1c033207452a4315d93bc780158.tar.gz
opensim-SC_OLD-72748746d53df1c033207452a4315d93bc780158.tar.bz2
opensim-SC_OLD-72748746d53df1c033207452a4315d93bc780158.tar.xz
Fixed some inconsistency with trailing /. Made debug messages consistent. Changed the stored region names of HG regions. Increased the size of regionName in DB.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs5
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
2 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index fcfb4d7..9ade100 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3691,10 +3691,9 @@ namespace OpenSim.Region.Framework.Scenes
3691 } 3691 }
3692 3692
3693 ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID); 3693 ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID);
3694 m_log.Debug("ICADU -> post wait"); 3694
3695 if (childAgentUpdate != null) 3695 if (childAgentUpdate != null)
3696 { 3696 {
3697 m_log.Debug("ICADU -> not child agent!");
3698 childAgentUpdate.ChildAgentDataUpdate(cAgentData); 3697 childAgentUpdate.ChildAgentDataUpdate(cAgentData);
3699 return true; 3698 return true;
3700 } 3699 }
@@ -3710,7 +3709,7 @@ namespace OpenSim.Region.Framework.Scenes
3710 /// <returns>true if we handled it.</returns> 3709 /// <returns>true if we handled it.</returns>
3711 public virtual bool IncomingChildAgentDataUpdate(AgentPosition cAgentData) 3710 public virtual bool IncomingChildAgentDataUpdate(AgentPosition cAgentData)
3712 { 3711 {
3713 m_log.Debug(" XXX Scene IncomingChildAgentDataUpdate POSITION in " + RegionInfo.RegionName); 3712 //m_log.Debug(" XXX Scene IncomingChildAgentDataUpdate POSITION in " + RegionInfo.RegionName);
3714 ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID); 3713 ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID);
3715 if (childAgentUpdate != null) 3714 if (childAgentUpdate != null)
3716 { 3715 {
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index d88526f..a1c80e5 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2933,7 +2933,7 @@ namespace OpenSim.Region.Framework.Scenes
2933 2933
2934 public void ChildAgentDataUpdate(AgentData cAgentData) 2934 public void ChildAgentDataUpdate(AgentData cAgentData)
2935 { 2935 {
2936 m_log.Debug(" >>> ChildAgentDataUpdate <<< " + Scene.RegionInfo.RegionName); 2936 //m_log.Debug(" >>> ChildAgentDataUpdate <<< " + Scene.RegionInfo.RegionName);
2937 if (!IsChildAgent) 2937 if (!IsChildAgent)
2938 return; 2938 return;
2939 2939