aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-07 21:07:14 +0000
committerJustin Clarke Casey2008-11-07 21:07:14 +0000
commit54e10e5b61aa543102bcc3a7415877c44aabb5df (patch)
treed16149d29a5ef4921e9256f6128cbb9cc17aadc0 /OpenSim/Region/Environment/Scenes/Scene.cs
parent* refactor: stop unnecessary passing of scene to sog copy constructor (diff)
downloadopensim-SC_OLD-54e10e5b61aa543102bcc3a7415877c44aabb5df.zip
opensim-SC_OLD-54e10e5b61aa543102bcc3a7415877c44aabb5df.tar.gz
opensim-SC_OLD-54e10e5b61aa543102bcc3a7415877c44aabb5df.tar.bz2
opensim-SC_OLD-54e10e5b61aa543102bcc3a7415877c44aabb5df.tar.xz
* Stop requiring local ids in the SOG constructors.
* These are assigned when the object is attached to the scene
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs11
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 95d9f2a..3931cf0 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1735,12 +1735,13 @@ namespace OpenSim.Region.Environment.Scenes
1735 //m_log.DebugFormat( 1735 //m_log.DebugFormat(
1736 // "[SCENE]: Scene.AddNewPrim() called for agent {0} in {1}", ownerID, RegionInfo.RegionName); 1736 // "[SCENE]: Scene.AddNewPrim() called for agent {0} in {1}", ownerID, RegionInfo.RegionName);
1737 1737
1738 SceneObjectGroup sceneOb = new SceneObjectGroup(ownerID, PrimIDAllocate(), pos, rot, shape); 1738 SceneObjectGroup sceneObject = new SceneObjectGroup(ownerID, pos, rot, shape);
1739 1739
1740 SceneObjectPart rootPart = sceneOb.GetChildPart(sceneOb.UUID); 1740 SceneObjectPart rootPart = sceneObject.GetChildPart(sceneObject.UUID);
1741 // if grass or tree, make phantom 1741 // if grass or tree, make phantom
1742 //rootPart.TrimPermissions(); 1742 //rootPart.TrimPermissions();
1743 if ((rootPart.Shape.PCode == (byte)PCode.Grass) || (rootPart.Shape.PCode == (byte)PCode.Tree) || (rootPart.Shape.PCode == (byte)PCode.NewTree)) 1743 if ((rootPart.Shape.PCode == (byte)PCode.Grass)
1744 || (rootPart.Shape.PCode == (byte)PCode.Tree) || (rootPart.Shape.PCode == (byte)PCode.NewTree))
1744 { 1745 {
1745 rootPart.AddFlag(PrimFlags.Phantom); 1746 rootPart.AddFlag(PrimFlags.Phantom);
1746 //rootPart.ObjectFlags += (uint)PrimFlags.Phantom; 1747 //rootPart.ObjectFlags += (uint)PrimFlags.Phantom;
@@ -1748,9 +1749,9 @@ namespace OpenSim.Region.Environment.Scenes
1748 AdaptTree(ref shape); 1749 AdaptTree(ref shape);
1749 } 1750 }
1750 1751
1751 AddNewSceneObject(sceneOb, true); 1752 AddNewSceneObject(sceneObject, true);
1752 1753
1753 return sceneOb; 1754 return sceneObject;
1754 } 1755 }
1755 1756
1756 void AdaptTree(ref PrimitiveBaseShape tree) 1757 void AdaptTree(ref PrimitiveBaseShape tree)