diff options
| author | UbitUmarov | 2017-01-27 20:21:24 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-27 20:21:24 +0000 |
| commit | 0091c37ed3fd3f9ed4edf079a61f986daadca16b (patch) | |
| tree | 6e5ca5cb7fa6ae6325d5222b37f39a794a48d345 /OpenSim/Region/OptionalModules | |
| parent | parcels must be loaded before objects, so they can be added to them (diff) | |
| download | opensim-SC_OLD-0091c37ed3fd3f9ed4edf079a61f986daadca16b.zip opensim-SC_OLD-0091c37ed3fd3f9ed4edf079a61f986daadca16b.tar.gz opensim-SC_OLD-0091c37ed3fd3f9ed4edf079a61f986daadca16b.tar.bz2 opensim-SC_OLD-0091c37ed3fd3f9ed4edf079a61f986daadca16b.tar.xz | |
several changes relative to objects return and parcel prim counts: avoid null refs, report correct count of returned objects, make obkects counts by ownership coerent with return rules, etc
Diffstat (limited to 'OpenSim/Region/OptionalModules')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs index bf74849..b26fa32 100644 --- a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs +++ b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs | |||
| @@ -523,8 +523,8 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator | |||
| 523 | 523 | ||
| 524 | rootPart.AddFlag(PrimFlags.Phantom); | 524 | rootPart.AddFlag(PrimFlags.Phantom); |
| 525 | 525 | ||
| 526 | m_scene.AddNewSceneObject(sceneObject, true); | ||
| 527 | sceneObject.SetGroup(groupID, null); | 526 | sceneObject.SetGroup(groupID, null); |
| 527 | m_scene.AddNewSceneObject(sceneObject, true); | ||
| 528 | sceneObject.AggregatePerms(); | 528 | sceneObject.AggregatePerms(); |
| 529 | return sceneObject; | 529 | return sceneObject; |
| 530 | } | 530 | } |