diff options
author | Diva Canto | 2009-09-18 19:17:02 -0700 |
---|---|---|
committer | Diva Canto | 2009-09-18 19:17:02 -0700 |
commit | 4a55ff88c088ac0019a1106d97a8b8dd173c8cff (patch) | |
tree | aa91fe204048d6f050cffca83168aec61f76a9a2 /OpenSim/Region/OptionalModules/ContentManagementSystem/PointMetaEntity.cs | |
parent | First pass at the grid service. (diff) | |
parent | correct off-by-one error in save iar command handling (diff) | |
download | opensim-SC_OLD-4a55ff88c088ac0019a1106d97a8b8dd173c8cff.zip opensim-SC_OLD-4a55ff88c088ac0019a1106d97a8b8dd173c8cff.tar.gz opensim-SC_OLD-4a55ff88c088ac0019a1106d97a8b8dd173c8cff.tar.bz2 opensim-SC_OLD-4a55ff88c088ac0019a1106d97a8b8dd173c8cff.tar.xz |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules/ContentManagementSystem/PointMetaEntity.cs')
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/PointMetaEntity.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/PointMetaEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/PointMetaEntity.cs index 59b7289..fbe43d6 100644 --- a/OpenSim/Region/OptionalModules/ContentManagementSystem/PointMetaEntity.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/PointMetaEntity.cs | |||
@@ -66,7 +66,6 @@ namespace OpenSim.Region.OptionalModules.ContentManagement | |||
66 | 66 | ||
67 | private void CreatePointEntity(Scene scene, UUID uuid, Vector3 groupPos) | 67 | private void CreatePointEntity(Scene scene, UUID uuid, Vector3 groupPos) |
68 | { | 68 | { |
69 | SceneObjectGroup x = new SceneObjectGroup(); | ||
70 | SceneObjectPart y = new SceneObjectPart(); | 69 | SceneObjectPart y = new SceneObjectPart(); |
71 | 70 | ||
72 | //Initialize part | 71 | //Initialize part |
@@ -93,8 +92,8 @@ namespace OpenSim.Region.OptionalModules.ContentManagement | |||
93 | y.TrimPermissions(); | 92 | y.TrimPermissions(); |
94 | 93 | ||
95 | //Initialize group and add part as root part | 94 | //Initialize group and add part as root part |
95 | SceneObjectGroup x = new SceneObjectGroup(y); | ||
96 | x.SetScene(scene); | 96 | x.SetScene(scene); |
97 | x.SetRootPart(y); | ||
98 | x.RegionHandle = scene.RegionInfo.RegionHandle; | 97 | x.RegionHandle = scene.RegionInfo.RegionHandle; |
99 | x.SetScene(scene); | 98 | x.SetScene(scene); |
100 | 99 | ||