OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

soprefactor
Melanie 2010-05-21 21:04:17 +01:00
parent 2b5b2f4e60 6918446fcd
commit 4e23acb133
2 changed files with 72 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -794,6 +794,8 @@ namespace OpenSim.Region.Framework.Scenes
#region Interest Management #region Interest Management
if (m_config != null)
{
IConfig interestConfig = m_config.Configs["InterestManagement"]; IConfig interestConfig = m_config.Configs["InterestManagement"];
if (interestConfig != null) if (interestConfig != null)
{ {
@ -814,6 +816,7 @@ namespace OpenSim.Region.Framework.Scenes
m_rootReprioritizationDistance = interestConfig.GetDouble("RootReprioritizationDistance", 10.0); m_rootReprioritizationDistance = interestConfig.GetDouble("RootReprioritizationDistance", 10.0);
m_childReprioritizationDistance = interestConfig.GetDouble("ChildReprioritizationDistance", 20.0); m_childReprioritizationDistance = interestConfig.GetDouble("ChildReprioritizationDistance", 20.0);
} }
}
m_log.Info("[SCENE]: Using the " + m_priorityScheme + " prioritization scheme"); m_log.Info("[SCENE]: Using the " + m_priorityScheme + " prioritization scheme");

32
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@ -278,7 +278,19 @@ namespace OpenSim.Region.Framework.Scenes
if (sceneObject == null || sceneObject.RootPart == null || sceneObject.RootPart.UUID == UUID.Zero) if (sceneObject == null || sceneObject.RootPart == null || sceneObject.RootPart.UUID == UUID.Zero)
return false; return false;
bool newlyAdded = false; lock (sceneObject)
{
if (Entities.ContainsKey(sceneObject.UUID))
{
// m_log.WarnFormat(
// "[SCENE GRAPH]: Scene object {0} {1} was already in region {2} on add request",
// sceneObject.Name, sceneObject.UUID, m_parentScene.RegionInfo.RegionName);
return false;
}
// m_log.DebugFormat(
// "[SCENE GRAPH]: Adding object {0} {1} to region {2}",
// sceneObject.Name, sceneObject.UUID, m_parentScene.RegionInfo.RegionName);
if (m_parentScene.m_clampPrimSize) if (m_parentScene.m_clampPrimSize)
{ {
@ -302,15 +314,6 @@ namespace OpenSim.Region.Framework.Scenes
if (sendClientUpdates) if (sendClientUpdates)
sceneObject.ScheduleGroupForFullUpdate(); sceneObject.ScheduleGroupForFullUpdate();
lock (sceneObject)
{
if (!Entities.ContainsKey(sceneObject.UUID))
{
// m_log.DebugFormat(
// "[SCENE GRAPH]: Adding object {0} {1} to region {2}",
// sceneObject.Name, sceneObject.UUID, m_parentScene.RegionInfo.RegionName);
newlyAdded = true;
Entities.Add(sceneObject); Entities.Add(sceneObject);
m_numPrim += sceneObject.Children.Count; m_numPrim += sceneObject.Children.Count;
@ -331,15 +334,8 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
} }
// else
// {
// m_log.WarnFormat(
// "[SCENE GRAPH]: Scene object {0} {1} was already in region {2} on add request",
// sceneObject.Name, sceneObject.UUID, m_parentScene.RegionInfo.RegionName);
// }
}
return newlyAdded; return true;
} }
/// <summary> /// <summary>