diff options
| author | Tom Grimshaw | 2010-06-27 22:23:08 -0700 |
|---|---|---|
| committer | Tom Grimshaw | 2010-06-27 22:23:08 -0700 |
| commit | 7807d118073fc3e82272e27eba8268d24e2a1f5d (patch) | |
| tree | d97d0a899f22d1707e38f96f61a0d40a9e7c4ace /OpenSim/Region/OptionalModules/ContentManagementSystem | |
| parent | Fix the sound issue. It was caused by missing assets; once the client has mad... (diff) | |
| parent | Change the way IRegionModule us referenced by IEmailModule to (diff) | |
| download | opensim-SC-7807d118073fc3e82272e27eba8268d24e2a1f5d.zip opensim-SC-7807d118073fc3e82272e27eba8268d24e2a1f5d.tar.gz opensim-SC-7807d118073fc3e82272e27eba8268d24e2a1f5d.tar.bz2 opensim-SC-7807d118073fc3e82272e27eba8268d24e2a1f5d.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/OptionalModules/ContentManagementSystem')
| -rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs index c277034..ada6701 100644 --- a/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs | |||
| @@ -73,7 +73,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement | |||
| 73 | public ContentManagementEntity(SceneObjectGroup Unchanged, bool physics) | 73 | public ContentManagementEntity(SceneObjectGroup Unchanged, bool physics) |
| 74 | : base(Unchanged, false) | 74 | : base(Unchanged, false) |
| 75 | { | 75 | { |
| 76 | m_UnchangedEntity = Unchanged.Copy(Unchanged.RootPart.OwnerID, Unchanged.RootPart.GroupID, false); | 76 | m_UnchangedEntity = Unchanged.Copy(false); |
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | public ContentManagementEntity(string objectXML, Scene scene, bool physics) | 79 | public ContentManagementEntity(string objectXML, Scene scene, bool physics) |
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs index 1a72971..841ee00 100644 --- a/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs | |||
| @@ -80,7 +80,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement | |||
| 80 | /// </summary> | 80 | /// </summary> |
| 81 | public MetaEntity(SceneObjectGroup orig, bool physics) | 81 | public MetaEntity(SceneObjectGroup orig, bool physics) |
| 82 | { | 82 | { |
| 83 | m_Entity = orig.Copy(orig.RootPart.OwnerID, orig.RootPart.GroupID, false); | 83 | m_Entity = orig.Copy(false); |
| 84 | Initialize(physics); | 84 | Initialize(physics); |
| 85 | } | 85 | } |
| 86 | 86 | ||