diff options
| author | Mike Rieker | 2010-07-06 02:23:10 +0000 |
|---|---|---|
| committer | Mike Rieker | 2010-07-06 02:23:10 +0000 |
| commit | 6e7f1a3ac11b889175c87f59a3c5361c704363a6 (patch) | |
| tree | 2ed5bebf54db3adc420e1510045b84b880ecb157 /OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs | |
| parent | rewrote hanging llParseStringKeepNulls() (diff) | |
| parent | Undo fix is now complete. This commit repairs the special case of the root pr... (diff) | |
| download | opensim-SC-6e7f1a3ac11b889175c87f59a3c5361c704363a6.zip opensim-SC-6e7f1a3ac11b889175c87f59a3c5361c704363a6.tar.gz opensim-SC-6e7f1a3ac11b889175c87f59a3c5361c704363a6.tar.bz2 opensim-SC-6e7f1a3ac11b889175c87f59a3c5361c704363a6.tar.xz | |
Merge branch 'careminster-presence-refactor' of www.3dhosting.de:/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs')
| -rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs | 2 |
1 files changed, 1 insertions, 1 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) |