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

In SG.AddSceneObject(), stop unnecessarily adding the root part to object indexes sepearately from the other parts. 

The SOG.Parts property contains the root part as well as the non-root parts
remove-scene-viewer
Justin Clark-Casey (justincc) 2011-09-13 17:56:02 +01:00
parent c14f0a22d4
commit 07ba28f1de
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -369,12 +369,12 @@ namespace OpenSim.Region.Framework.Scenes
// "[SCENEGRAPH]: Adding scene object {0} {1}, with {2} parts on {3}", // "[SCENEGRAPH]: Adding scene object {0} {1}, with {2} parts on {3}",
// sceneObject.Name, sceneObject.UUID, sceneObject.Parts.Length, m_parentScene.RegionInfo.RegionName); // sceneObject.Name, sceneObject.UUID, sceneObject.Parts.Length, m_parentScene.RegionInfo.RegionName);
SceneObjectPart[] children = sceneObject.Parts; SceneObjectPart[] parts = sceneObject.Parts;
// Clamp child prim sizes and add child prims to the m_numPrim count // Clamp child prim sizes and add child prims to the m_numPrim count
if (m_parentScene.m_clampPrimSize) if (m_parentScene.m_clampPrimSize)
{ {
foreach (SceneObjectPart part in children) foreach (SceneObjectPart part in parts)
{ {
Vector3 scale = part.Shape.Scale; Vector3 scale = part.Shape.Scale;
@ -388,7 +388,7 @@ namespace OpenSim.Region.Framework.Scenes
part.Shape.Scale = scale; part.Shape.Scale = scale;
} }
} }
m_numPrim += children.Length; m_numPrim += parts.Length;
sceneObject.AttachToScene(m_parentScene); sceneObject.AttachToScene(m_parentScene);
@ -408,8 +408,7 @@ namespace OpenSim.Region.Framework.Scenes
lock (SceneObjectGroupsByFullPartID) lock (SceneObjectGroupsByFullPartID)
{ {
SceneObjectGroupsByFullPartID[sceneObject.UUID] = sceneObject; foreach (SceneObjectPart part in parts)
foreach (SceneObjectPart part in children)
SceneObjectGroupsByFullPartID[part.UUID] = sceneObject; SceneObjectGroupsByFullPartID[part.UUID] = sceneObject;
} }
@ -419,8 +418,7 @@ namespace OpenSim.Region.Framework.Scenes
// "[SCENE GRAPH]: Adding scene object {0} {1} {2} to SceneObjectGroupsByLocalPartID in {3}", // "[SCENE GRAPH]: Adding scene object {0} {1} {2} to SceneObjectGroupsByLocalPartID in {3}",
// sceneObject.Name, sceneObject.UUID, sceneObject.LocalId, m_parentScene.RegionInfo.RegionName); // sceneObject.Name, sceneObject.UUID, sceneObject.LocalId, m_parentScene.RegionInfo.RegionName);
SceneObjectGroupsByLocalPartID[sceneObject.LocalId] = sceneObject; foreach (SceneObjectPart part in parts)
foreach (SceneObjectPart part in children)
SceneObjectGroupsByLocalPartID[part.LocalId] = sceneObject; SceneObjectGroupsByLocalPartID[part.LocalId] = sceneObject;
} }