diff options
author | Justin Clarke Casey | 2009-03-13 20:46:53 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-03-13 20:46:53 +0000 |
commit | c04e7cdf2b8f95534dafe7faedb29e1ff1af36c8 (patch) | |
tree | fc5a72b39ba72eee84afba4dc9ff315acbb0096f /OpenSim/Region/Framework/Scenes | |
parent | * Remove asset cache size and texture stat reports from ASSET STATS since the... (diff) | |
download | opensim-SC-c04e7cdf2b8f95534dafe7faedb29e1ff1af36c8.zip opensim-SC-c04e7cdf2b8f95534dafe7faedb29e1ff1af36c8.tar.gz opensim-SC-c04e7cdf2b8f95534dafe7faedb29e1ff1af36c8.tar.bz2 opensim-SC-c04e7cdf2b8f95534dafe7faedb29e1ff1af36c8.tar.xz |
* Support loading empty folders in an iar
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 4eb8a28..011d9a6 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -518,6 +518,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
518 | itemCopy.GroupPermissions = item.GroupPermissions & item.NextPermissions; | 518 | itemCopy.GroupPermissions = item.GroupPermissions & item.NextPermissions; |
519 | itemCopy.BasePermissions = item.BasePermissions; | 519 | itemCopy.BasePermissions = item.BasePermissions; |
520 | } | 520 | } |
521 | |||
521 | itemCopy.GroupID = UUID.Zero; | 522 | itemCopy.GroupID = UUID.Zero; |
522 | itemCopy.GroupOwned = false; | 523 | itemCopy.GroupOwned = false; |
523 | itemCopy.Flags = item.Flags; | 524 | itemCopy.Flags = item.Flags; |
@@ -2467,12 +2468,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
2467 | part.NextOwnerMask = item.NextPermissions; | 2468 | part.NextOwnerMask = item.NextPermissions; |
2468 | } | 2469 | } |
2469 | } | 2470 | } |
2471 | |||
2470 | rootPart.TrimPermissions(); | 2472 | rootPart.TrimPermissions(); |
2473 | |||
2471 | if (group.RootPart.Shape.PCode == (byte)PCode.Prim) | 2474 | if (group.RootPart.Shape.PCode == (byte)PCode.Prim) |
2472 | { | 2475 | { |
2473 | group.ClearPartAttachmentData(); | 2476 | group.ClearPartAttachmentData(); |
2474 | } | 2477 | } |
2478 | |||
2475 | group.UpdateGroupRotation(rot); | 2479 | group.UpdateGroupRotation(rot); |
2480 | |||
2476 | //group.ApplyPhysics(m_physicalPrim); | 2481 | //group.ApplyPhysics(m_physicalPrim); |
2477 | if (group.RootPart.PhysActor != null && group.RootPart.PhysActor.IsPhysical && vel != Vector3.Zero) | 2482 | if (group.RootPart.PhysActor != null && group.RootPart.PhysActor.IsPhysical && vel != Vector3.Zero) |
2478 | { | 2483 | { |