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

Minor formatting cleanup.

0.6.0-stable
Jeff Ames 2008-10-29 03:22:54 +00:00
parent 3fd35f9fbe
commit 395a0f7977
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Environment/Scenes/InnerScene.cs
View File

@ -1373,7 +1373,7 @@ namespace OpenSim.Region.Environment.Scenes
List<SceneObjectGroup> children = new List<SceneObjectGroup>(); List<SceneObjectGroup> children = new List<SceneObjectGroup>();
if (parenPrim != null) if (parenPrim != null)
{ {
// We do this in reverse to get the link order of the prims correct // We do this in reverse to get the link order of the prims correct
for (int i = childPrims.Count - 1; i >= 0; i--) for (int i = childPrims.Count - 1; i >= 0; i--)
{ {
foreach (EntityBase ent in EntityList) foreach (EntityBase ent in EntityList)

64
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@ -1831,41 +1831,41 @@ namespace OpenSim.Region.Environment.Scenes
{ {
m_parts.Add(linkPart.UUID, linkPart); m_parts.Add(linkPart.UUID, linkPart);
// Insert in terms of link numbers, the new links // Insert in terms of link numbers, the new links
// before the current ones (with the exception of // before the current ones (with the exception of
// the root prim. Shuffle the old ones up // the root prim. Shuffle the old ones up
foreach (KeyValuePair<UUID, SceneObjectPart> kvp in m_parts) foreach (KeyValuePair<UUID, SceneObjectPart> kvp in m_parts)
{ {
if (kvp.Value.LinkNum != 1) { if (kvp.Value.LinkNum != 1)
// Don't update root prim link number {
kvp.Value.LinkNum += objectGroup.PrimCount; // Don't update root prim link number
} kvp.Value.LinkNum += objectGroup.PrimCount;
} }
}
linkPart.LinkNum = 2;
linkPart.LinkNum = 2; linkPart.SetParent(this);
linkPart.AddFlag(PrimFlags.CreateSelected);
linkPart.SetParent(this); //if (linkPart.PhysActor != null)
linkPart.AddFlag(PrimFlags.CreateSelected); //{
// m_scene.PhysicsScene.RemovePrim(linkPart.PhysActor);
//if (linkPart.PhysActor != null) //linkPart.PhysActor = null;
//{ //}
// m_scene.PhysicsScene.RemovePrim(linkPart.PhysActor);
//linkPart.PhysActor = null; //TODO: rest of parts
//} int linkNum = 3;
foreach (SceneObjectPart part in objectGroup.Children.Values)
//TODO: rest of parts {
int linkNum = 3; if (part.UUID != objectGroup.m_rootPart.UUID)
foreach (SceneObjectPart part in objectGroup.Children.Values) {
{ LinkNonRootPart(part, oldGroupPosition, oldRootRotation, linkNum++);
if (part.UUID != objectGroup.m_rootPart.UUID) }
{ part.ClearUndoState();
LinkNonRootPart(part, oldGroupPosition, oldRootRotation, linkNum++); }
} }
part.ClearUndoState();
}
}
m_scene.UnlinkSceneObject(objectGroup.UUID, true); m_scene.UnlinkSceneObject(objectGroup.UUID, true);
objectGroup.Children.Clear(); objectGroup.Children.Clear();
@ -1979,8 +1979,8 @@ namespace OpenSim.Region.Environment.Scenes
part.SetParent(this); part.SetParent(this);
part.ParentID = m_rootPart.LocalId; part.ParentID = m_rootPart.LocalId;
// Caller locks m_parts for us // Caller locks m_parts for us
m_parts.Add(part.UUID, part); m_parts.Add(part.UUID, part);
part.LinkNum = linkNum; part.LinkNum = linkNum;