aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJeff Ames2008-10-29 03:22:54 +0000
committerJeff Ames2008-10-29 03:22:54 +0000
commit395a0f7977a00f0c86e5718b2f4349f731b60609 (patch)
tree9e6bc20b983b0fa066d7e9ed9f0ec9c523709518 /OpenSim
parentGridManager.GetRegions() now returns a List, not a Dictionary. Also removed s... (diff)
downloadopensim-SC-395a0f7977a00f0c86e5718b2f4349f731b60609.zip
opensim-SC-395a0f7977a00f0c86e5718b2f4349f731b60609.tar.gz
opensim-SC-395a0f7977a00f0c86e5718b2f4349f731b60609.tar.bz2
opensim-SC-395a0f7977a00f0c86e5718b2f4349f731b60609.tar.xz
Minor formatting cleanup.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs74
2 files changed, 38 insertions, 38 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 295569e..1e21a58 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -1373,7 +1373,7 @@ namespace OpenSim.Region.Environment.Scenes
1373 List<SceneObjectGroup> children = new List<SceneObjectGroup>(); 1373 List<SceneObjectGroup> children = new List<SceneObjectGroup>();
1374 if (parenPrim != null) 1374 if (parenPrim != null)
1375 { 1375 {
1376 // We do this in reverse to get the link order of the prims correct 1376 // We do this in reverse to get the link order of the prims correct
1377 for (int i = childPrims.Count - 1; i >= 0; i--) 1377 for (int i = childPrims.Count - 1; i >= 0; i--)
1378 { 1378 {
1379 foreach (EntityBase ent in EntityList) 1379 foreach (EntityBase ent in EntityList)
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 32c9255..98c7fb5 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -1831,41 +1831,41 @@ namespace OpenSim.Region.Environment.Scenes
1831 { 1831 {
1832 m_parts.Add(linkPart.UUID, linkPart); 1832 m_parts.Add(linkPart.UUID, linkPart);
1833 1833
1834 // Insert in terms of link numbers, the new links 1834 // Insert in terms of link numbers, the new links
1835 // before the current ones (with the exception of 1835 // before the current ones (with the exception of
1836 // the root prim. Shuffle the old ones up 1836 // the root prim. Shuffle the old ones up
1837 foreach (KeyValuePair<UUID, SceneObjectPart> kvp in m_parts) 1837 foreach (KeyValuePair<UUID, SceneObjectPart> kvp in m_parts)
1838 { 1838 {
1839 if (kvp.Value.LinkNum != 1) { 1839 if (kvp.Value.LinkNum != 1)
1840 // Don't update root prim link number 1840 {
1841 kvp.Value.LinkNum += objectGroup.PrimCount; 1841 // Don't update root prim link number
1842 } 1842 kvp.Value.LinkNum += objectGroup.PrimCount;
1843 } 1843 }
1844 1844 }
1845 1845
1846 linkPart.LinkNum = 2; 1846 linkPart.LinkNum = 2;
1847 1847
1848 linkPart.SetParent(this); 1848 linkPart.SetParent(this);
1849 linkPart.AddFlag(PrimFlags.CreateSelected); 1849 linkPart.AddFlag(PrimFlags.CreateSelected);
1850 1850
1851 //if (linkPart.PhysActor != null) 1851 //if (linkPart.PhysActor != null)
1852 //{ 1852 //{
1853 // m_scene.PhysicsScene.RemovePrim(linkPart.PhysActor); 1853 // m_scene.PhysicsScene.RemovePrim(linkPart.PhysActor);
1854 1854
1855 //linkPart.PhysActor = null; 1855 //linkPart.PhysActor = null;
1856 //} 1856 //}
1857 1857
1858 //TODO: rest of parts 1858 //TODO: rest of parts
1859 int linkNum = 3; 1859 int linkNum = 3;
1860 foreach (SceneObjectPart part in objectGroup.Children.Values) 1860 foreach (SceneObjectPart part in objectGroup.Children.Values)
1861 { 1861 {
1862 if (part.UUID != objectGroup.m_rootPart.UUID) 1862 if (part.UUID != objectGroup.m_rootPart.UUID)
1863 { 1863 {
1864 LinkNonRootPart(part, oldGroupPosition, oldRootRotation, linkNum++); 1864 LinkNonRootPart(part, oldGroupPosition, oldRootRotation, linkNum++);
1865 } 1865 }
1866 part.ClearUndoState(); 1866 part.ClearUndoState();
1867 } 1867 }
1868 } 1868 }
1869 1869
1870 m_scene.UnlinkSceneObject(objectGroup.UUID, true); 1870 m_scene.UnlinkSceneObject(objectGroup.UUID, true);
1871 objectGroup.Children.Clear(); 1871 objectGroup.Children.Clear();
@@ -1979,8 +1979,8 @@ namespace OpenSim.Region.Environment.Scenes
1979 part.SetParent(this); 1979 part.SetParent(this);
1980 part.ParentID = m_rootPart.LocalId; 1980 part.ParentID = m_rootPart.LocalId;
1981 1981
1982 // Caller locks m_parts for us 1982 // Caller locks m_parts for us
1983 m_parts.Add(part.UUID, part); 1983 m_parts.Add(part.UUID, part);
1984 1984
1985 part.LinkNum = linkNum; 1985 part.LinkNum = linkNum;
1986 1986