aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorMelanie Thielker2008-11-17 23:43:46 +0000
committerMelanie Thielker2008-11-17 23:43:46 +0000
commit2b8915d679c9d17989572dde9f6040338c508a12 (patch)
treeecf6e8ecbf73a166ea684fdd1742360920433482 /OpenSim/Region/Environment
parentMake texture decode errors nonfatal. The texture send is simply dropped (diff)
downloadopensim-SC_OLD-2b8915d679c9d17989572dde9f6040338c508a12.zip
opensim-SC_OLD-2b8915d679c9d17989572dde9f6040338c508a12.tar.gz
opensim-SC_OLD-2b8915d679c9d17989572dde9f6040338c508a12.tar.bz2
opensim-SC_OLD-2b8915d679c9d17989572dde9f6040338c508a12.tar.xz
Make newly created prims be the correct group
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs11
3 files changed, 8 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs
index 02c4ab0..dfca655 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs
@@ -468,7 +468,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
468 m_log.Debug("[CONTENT MANAGEMENT]scale"); 468 m_log.Debug("[CONTENT MANAGEMENT]scale");
469 } 469 }
470 470
471 protected void UpdateNewParts(UUID ownerID, Vector3 RayEnd, Quaternion rot, PrimitiveBaseShape shape, 471 protected void UpdateNewParts(UUID ownerID, UUID groupID, Vector3 RayEnd, Quaternion rot, PrimitiveBaseShape shape,
472 byte bypassRaycast, Vector3 RayStart, UUID RayTargetID, 472 byte bypassRaycast, Vector3 RayStart, UUID RayTargetID,
473 byte RayEndIsIntersection) 473 byte RayEndIsIntersection)
474 { 474 {
diff --git a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs
index b6879b0..990d36e 100644
--- a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs
@@ -234,7 +234,7 @@ namespace OpenSim.Region.Environment.Modules.World.TreePopulator
234 position.Z = (float) m_scene.Heightmap[(int) position.X, (int) position.Y]; 234 position.Z = (float) m_scene.Heightmap[(int) position.X, (int) position.Y];
235 235
236 SceneObjectGroup tree = 236 SceneObjectGroup tree =
237 m_scene.AddTree(uuid, new Vector3(0.1f, 0.1f, 0.1f), 237 m_scene.AddTree(uuid, UUID.Zero, new Vector3(0.1f, 0.1f, 0.1f),
238 Quaternion.Identity, 238 Quaternion.Identity,
239 position, 239 position,
240 Tree.Cypress1, 240 Tree.Cypress1,
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index cf743de..2287f99 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1738,7 +1738,7 @@ namespace OpenSim.Region.Environment.Scenes
1738 } 1738 }
1739 } 1739 }
1740 1740
1741 public virtual void AddNewPrim(UUID ownerID, Vector3 RayEnd, Quaternion rot, PrimitiveBaseShape shape, 1741 public virtual void AddNewPrim(UUID ownerID, UUID groupID, Vector3 RayEnd, Quaternion rot, PrimitiveBaseShape shape,
1742 byte bypassRaycast, Vector3 RayStart, UUID RayTargetID, 1742 byte bypassRaycast, Vector3 RayStart, UUID RayTargetID,
1743 byte RayEndIsIntersection) 1743 byte RayEndIsIntersection)
1744 { 1744 {
@@ -1749,11 +1749,11 @@ namespace OpenSim.Region.Environment.Scenes
1749 // rez ON the ground, not IN the ground 1749 // rez ON the ground, not IN the ground
1750 pos.Z += 0.25F; 1750 pos.Z += 0.25F;
1751 1751
1752 AddNewPrim(ownerID, pos, rot, shape); 1752 AddNewPrim(ownerID, groupID, pos, rot, shape);
1753 } 1753 }
1754 } 1754 }
1755 1755
1756 public virtual SceneObjectGroup AddNewPrim(UUID ownerID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape) 1756 public virtual SceneObjectGroup AddNewPrim(UUID ownerID, UUID groupID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape)
1757 { 1757 {
1758 //m_log.DebugFormat( 1758 //m_log.DebugFormat(
1759 // "[SCENE]: Scene.AddNewPrim() called for agent {0} in {1}", ownerID, RegionInfo.RegionName); 1759 // "[SCENE]: Scene.AddNewPrim() called for agent {0} in {1}", ownerID, RegionInfo.RegionName);
@@ -1772,6 +1772,7 @@ namespace OpenSim.Region.Environment.Scenes
1772 AdaptTree(ref shape); 1772 AdaptTree(ref shape);
1773 } 1773 }
1774 1774
1775 sceneObject.SetGroup(groupID, null);
1775 AddNewSceneObject(sceneObject, true); 1776 AddNewSceneObject(sceneObject, true);
1776 1777
1777 return sceneObject; 1778 return sceneObject;
@@ -1797,7 +1798,7 @@ namespace OpenSim.Region.Environment.Scenes
1797 } 1798 }
1798 } 1799 }
1799 1800
1800 public SceneObjectGroup AddTree(UUID uuid, Vector3 scale, Quaternion rotation, Vector3 position, 1801 public SceneObjectGroup AddTree(UUID uuid, UUID groupID, Vector3 scale, Quaternion rotation, Vector3 position,
1801 Tree treeType, bool newTree) 1802 Tree treeType, bool newTree)
1802 { 1803 {
1803 PrimitiveBaseShape treeShape = new PrimitiveBaseShape(); 1804 PrimitiveBaseShape treeShape = new PrimitiveBaseShape();
@@ -1806,7 +1807,7 @@ namespace OpenSim.Region.Environment.Scenes
1806 treeShape.PCode = newTree ? (byte)PCode.NewTree : (byte)PCode.Tree; 1807 treeShape.PCode = newTree ? (byte)PCode.NewTree : (byte)PCode.Tree;
1807 treeShape.Scale = scale; 1808 treeShape.Scale = scale;
1808 treeShape.State = (byte)treeType; 1809 treeShape.State = (byte)treeType;
1809 return AddNewPrim(uuid, position, rotation, treeShape); 1810 return AddNewPrim(uuid, groupID, position, rotation, treeShape);
1810 } 1811 }
1811 1812
1812 /// <summary> 1813 /// <summary>