aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules
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/Modules
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/Modules')
-rw-r--r--OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs2
2 files changed, 2 insertions, 2 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,